summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2014-12-17 12:21:36 -0600
committerChris Buechler <cmb@pfsense.org>2014-12-17 12:21:36 -0600
commitf1905a3ecab4811bcdfa42997c11c719ab87a060 (patch)
tree2f14e2d27ac88402ba35d0ec6b20e702d8ff4f6e /etc
parentb0885c5a7aa20801d78df77f5124eca766f34723 (diff)
downloadpfsense-f1905a3ecab4811bcdfa42997c11c719ab87a060.zip
pfsense-f1905a3ecab4811bcdfa42997c11c719ab87a060.tar.gz
syslogd can't just be HUPed to pick up its new config, as many of those
are command line arguments. Go back to 2.1x and prior behavior of TERM and restart. Fixes source IP use with syslog among other config changes.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/system.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 3843508..7f6af33 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -887,9 +887,9 @@ EOD;
}
if (isvalidpid("{$g['varrun_path']}/syslog.pid"))
- sigkillbypid("{$g['varrun_path']}/syslog.pid", "HUP");
- else
- $retval = mwexec_bg("/usr/sbin/syslogd -s -c -c -l {$g['dhcpd_chroot_path']}/var/run/log -P {$g['varrun_path']}/syslog.pid {$syslogd_extra}");
+ sigkillbypid("{$g['varrun_path']}/syslog.pid", "TERM");
+
+ $retval = mwexec_bg("/usr/sbin/syslogd -s -c -c -l {$g['dhcpd_chroot_path']}/var/run/log -P {$g['varrun_path']}/syslog.pid {$syslogd_extra}");
if (platform_booting())
echo gettext("done.") . "\n";
OpenPOWER on IntegriCloud