emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CONFIG_PID_FILE_PATH: new configuration option for pidfile paths

Browse Source 
We set a default path for the directory where pidfiles are create
when FEATURE_PIDFILE is selected.  The default has no effect on
applets which must specify a pidfile path on the command line to
run, and it can be overridden by applets which optionally allow
the user to specify the pidfile path.

We also add pidfile write/remove support for klogd, ntpd and watchdog.
For syslogd, we add a missing remove_pidfile() for better cleanup
on daemon exit.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Anthony G. Basile
2012-12-10 14:49:39 -05:00
committed by Mike Frysinger
parent 393c395ca5
commit 12677acf0a
9 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sysklogd/klogd.c
View File

@@ -195,6 +195,8 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
write_pidfile(CONFIG_PID_FILE_PATH "/klogd.pid");
used = 0;
while (!bb_got_signal) {
int n;
@@ -258,6 +260,7 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
klogd_close();
syslog(LOG_NOTICE, "klogd: exiting");
remove_pidfile(CONFIG_PID_FILE_PATH "/klogd.pid");
if (bb_got_signal)
kill_myself_with_sig(bb_got_signal);
return EXIT_FAILURE;

5
sysklogd/syslogd.c
View File

@@ -916,6 +916,7 @@ static void do_syslogd(void)
timestamp_and_log_internal("syslogd exiting");
puts("syslogd exiting");
remove_pidfile(CONFIG_PID_FILE_PATH "/syslogd.pid");
if (ENABLE_FEATURE_IPC_SYSLOG)
ipcsyslog_cleanup();
kill_myself_with_sig(bb_got_signal);
@@ -979,8 +980,10 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
if (!(opts & OPT_nofork)) {
bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
}
//umask(0); - why??
write_pidfile("/var/run/syslogd.pid");
write_pidfile(CONFIG_PID_FILE_PATH "/syslogd.pid");
do_syslogd();
/* return EXIT_SUCCESS; */
}