2 files changed, 7 insertions, 1 deletions

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index efa0e537a..f59a155b4 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -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;
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index fc380d9f9..5854bcd0f 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -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; */
 }