diff options
| author | Zdenek Prikryl <zprikryl@redhat.com> | 2009-06-17 16:23:08 +0200 |
|---|---|---|
| committer | Zdenek Prikryl <zprikryl@redhat.com> | 2009-06-17 16:23:08 +0200 |
| commit | 5d157e341fed5782c1fbfdd5f820a8d349824e84 (patch) | |
| tree | def00b43941b209e2fcc4719018193e6c8753ada | |
| parent | f31ebd2e0aafc9404c95b8fe92a02d58216f918d (diff) | |
new default path for lock file
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Daemon/CrashWatcher.cpp | 4 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 3a2e624..33e3cd3 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ AC_CHECK_HEADER([magic.h], [], [AC_MSG_ERROR([magic.h is needed to build abrt])]) CONF_DIR='${sysconfdir}/${PACKAGE_NAME}' -VAR_RUN = '${localstatedir}/run' +VAR_RUN='${localstatedir}/run' PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1' @@ -54,6 +54,7 @@ AC_ARG_ENABLE(dbus, AC_SUBST(ENABLE_SOCKET_OR_DBUS) AC_SUBST(CONF_DIR) +AC_SUBST(VAR_RUN) AC_SUBST(PLUGINS_CONF_DIR) AC_SUBST(PLUGINS_LIB_DIR) AC_SUBST(DEBUG_DUMPS_DIR) diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 0112c73..2670ce8 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -33,6 +33,8 @@ #include <cstring> #include "ABRTException.h" +#define VAR_RUN_LOCK_FILE VAR_RUN"/abrt.lock" + /* just a helper function template< class T > std::string @@ -485,7 +487,7 @@ void CCrashWatcher::FindNewDumps(const std::string& pPath) void CCrashWatcher::Lock() { - int lfp = open((std::string(VAR_RUN) + "abrt.lock").c_str(),O_RDWR|O_CREAT,0640); + int lfp = open(VAR_RUN_LOCK_FILE, O_RDWR|O_CREAT,0640); if (lfp < 0) { throw CABRTException(EXCEP_FATAL, "CCrashWatcher::Lock(): can not open lock file"); diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index 4af30fd..998168e 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -2,13 +2,13 @@ sbin_PROGRAMS = abrt abrt_SOURCES = CrashWatcher.cpp CrashWatcher.h Daemon.cpp DBusServerProxy.h \ DBusCommon.h Settings.h Settings.cpp abrt_CPPFLAGS = -I$(srcdir)/../../lib/MiddleWare -I$(srcdir)/../../lib/CommLayer\ - -I$(srcdir)/../../inc -I$(srcdir)/../../lib/Utils\ + -I$(srcdir)/../../inc -I$(srcdir)/../../lib/Utils \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ -DCONF_DIR=\"$(CONF_DIR)\" \ - -DVAR_RUN=\"$(VAR_RUN)\" \ - $(ENABLE_SOCKET_OR_DBUS) + -DVAR_RUN=\"$(VAR_RUN)\" $(ENABLE_SOCKET_OR_DBUS) + abrt_LDADD = ../../lib/MiddleWare/libABRTMiddleWare.la ../../lib/CommLayer/libABRTCommLayer.la $(DL_LIBS) $(DBUSCPP_LIBS) $(RPM_LIBS) dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/ dist_dbusabrtconf_DATA = dbus-abrt.conf |