diff options
| author | Justin Pettit <jpettit@nicira.com> | 2009-08-05 14:20:24 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2009-08-06 18:04:36 -0700 |
| commit | e7bd7d78b1e1dbc2162f991374c7889c7d7bf60c (patch) | |
| tree | 3b0953d2dc163d7344427b5f223f73c86c15eeed /lib/daemon.c | |
| parent | 8093d640ac758c062515b2819e633dd4e19c516a (diff) | |
| download | openvswitch-e7bd7d78b1e1dbc2162f991374c7889c7d7bf60c.tar.gz | |
daemon: Remove short options from daemon library
The daemon library provides a few short options, but these then take
away their availability from programs that wish to use the library.
Since the daemon options are generally going to be called from a script
(which doesn't care how much typing is involved), we'll only provide
long options.
Diffstat (limited to 'lib/daemon.c')
| -rw-r--r-- | lib/daemon.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/daemon.c b/lib/daemon.c index a011d37fe..1e3f00295 100644 --- a/lib/daemon.c +++ b/lib/daemon.c @@ -35,7 +35,7 @@ static bool detach; static char *pidfile; /* Create pidfile even if one already exists and is locked? */ -static bool force; +static bool overwrite_pidfile; /* Should we chdir to "/". */ static bool chdir_ = true; @@ -85,7 +85,7 @@ set_no_chdir(void) void ignore_existing_pidfile(void) { - force = true; + overwrite_pidfile = true; } /* Sets up a following call to daemonize() to detach from the foreground @@ -127,7 +127,7 @@ die_if_already_running(void) { pid_t pid = already_running(); if (pid) { - if (!force) { + if (!overwrite_pidfile) { ovs_fatal(0, "%s: already running as pid %ld", get_pidfile(), (long int) pid); } else { @@ -239,10 +239,11 @@ daemon_usage(void) { printf( "\nDaemon options:\n" - " -D, --detach run in background as daemon\n" + " --detach run in background as daemon\n" " --no-chdir do not chdir to '/'\n" - " -P, --pidfile[=FILE] create pidfile (default: %s/%s.pid)\n" - " -f, --force with -P, start even if already running\n", + " --pidfile[=FILE] create pidfile (default: %s/%s.pid)\n" + " --overwrite-pidfile with --pidfile, start even if already " + "running\n", ovs_rundir, program_name); } |