summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikola Pajkovsky <npajkovs@redhat.com>2010-05-12 18:15:08 +0200
committerNikola Pajkovsky <npajkovs@redhat.com>2010-05-12 18:15:08 +0200
commita72fe5a348f224dc4bb08dae0d77b762d6ca64e5 (patch)
tree4de47aeff497525b1052ea1165396dfe991b5b63
parentda9ae9cc0e9376f85daec9a9575527aa85d32834 (diff)
parent44f246dd79d3240d7fbcf2cbb62ffcfe749a8ad1 (diff)
downloadabrt-a72fe5a348f224dc4bb08dae0d77b762d6ca64e5.tar.gz
abrt-a72fe5a348f224dc4bb08dae0d77b762d6ca64e5.tar.xz
abrt-a72fe5a348f224dc4bb08dae0d77b762d6ca64e5.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
-rw-r--r--abrt.init2
-rw-r--r--src/Daemon/Daemon.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/abrt.init b/abrt.init
index 0701fe23..dde5950d 100644
--- a/abrt.init
+++ b/abrt.init
@@ -104,7 +104,7 @@ condrestart)
fi
;;
status)
- status abrt
+ status abrtd
RETVAL=$?
;;
*)
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index bedc912b..98b6a5be 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -86,8 +86,8 @@ using namespace std;
*/
-#define VAR_RUN_LOCK_FILE VAR_RUN"/abrt.lock"
-#define VAR_RUN_PIDFILE VAR_RUN"/abrt.pid"
+#define VAR_RUN_LOCK_FILE VAR_RUN"/abrtd.lock"
+#define VAR_RUN_PIDFILE VAR_RUN"/abrtd.pid"
//FIXME: add some struct to be able to join all threads!