summaryrefslogtreecommitdiffstats
path: root/src/Daemon
diff options
context:
space:
mode:
authorNikola Pajkovsky <npajkovs@redhat.com>2010-06-30 14:42:48 +0200
committerNikola Pajkovsky <npajkovs@redhat.com>2010-06-30 14:42:48 +0200
commite04fc8effd469803811435111bb22fb5a6db44b8 (patch)
tree2e4e3e24af02c68e608ecc9ea80c28feb494b449 /src/Daemon
parentb85c61e854bfd80876825970d1d25399590795cd (diff)
parentbe7875678a508b7524465b3a62bef87d57e2a80e (diff)
downloadabrt-e04fc8effd469803811435111bb22fb5a6db44b8.tar.gz
abrt-e04fc8effd469803811435111bb22fb5a6db44b8.tar.xz
abrt-e04fc8effd469803811435111bb22fb5a6db44b8.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src/Daemon')
-rw-r--r--src/Daemon/Daemon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 6c61d4df..02b8b96e 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -770,7 +770,7 @@ int main(int argc, char** argv)
/* fall through to error */
default:
error_msg_and_die(
- "Usage: abrtd [-dv]\n"
+ "Usage: abrtd [-dsv] [-t SEC]\n"
"\nOptions:"
"\n\t-d\tDo not daemonize"
"\n\t-s\tLog to syslog even with -d"
@@ -797,7 +797,7 @@ int main(int argc, char** argv)
pid_t pid = fork();
if (pid < 0)
{
- perror_msg_and_die("Can't fork");
+ perror_msg_and_die("fork");
}
if (pid > 0)
{