summaryrefslogtreecommitdiffstats
path: root/etc/inc/system.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2004-12-05 19:56:11 +0000
committerScott Ullrich <sullrich@pfsense.org>2004-12-05 19:56:11 +0000
commita23d72487189307f63465c7150f6ca3a0cb027b3 (patch)
tree7f336d3e8c377e7ad411984ac5f313f5046a8c6f /etc/inc/system.inc
parent07bd3f83b401d8e9e9de3938e0a26c6e452660af (diff)
downloadpfsense-a23d72487189307f63465c7150f6ca3a0cb027b3.zip
pfsense-a23d72487189307f63465c7150f6ca3a0cb027b3.tar.gz
Merge in m0n0wall 1.2b3 changes.
Diffstat (limited to 'etc/inc/system.inc')
-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 69470d6..afd25c6 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -237,7 +237,7 @@ EOD;
if (isset($syslogcfg['system'])) {
$syslogconf .= <<<EOD
-*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local4.none;local7.none @{$syslogcfg['remoteserver']}
+*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local7.none @{$syslogcfg['remoteserver']}
security.* @{$syslogcfg['remoteserver']}
auth.info;authpriv.info;daemon.info @{$syslogcfg['remoteserver']}
*.emerg @{$syslogcfg['remoteserver']}
@@ -484,7 +484,7 @@ function system_do_shell_commands($early = 0) {
}
}
-function system_do_extensions() {
+function system_do_extensions($early = false) {
global $config, $g;
if (!is_dir("{$g['etc_path']}/inc/ext"))
@@ -495,7 +495,7 @@ function system_do_extensions() {
while (($extd = readdir($dh)) !== false) {
if (($extd === ".") || ($extd === ".."))
continue;
- $rcfile = "{$g['etc_path']}/inc/ext/" . $extd . "/rc";
+ $rcfile = "{$g['etc_path']}/inc/ext/" . $extd . "/" . ($early ? "rc.early" : "rc");
if (file_exists($rcfile))
passthru($rcfile);
}
OpenPOWER on IntegriCloud