diff options
author | jim-p <jimp@pfsense.org> | 2011-05-19 12:54:03 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-05-19 12:54:03 -0400 |
commit | 12ac39e824b1d45dd061cb436d77af17b2c6491c (patch) | |
tree | d1968465bdbd03f3fdf30964b0b1fa268a1c540a /etc | |
parent | c1f4af16f30196aa201e9695e2a64143d815312d (diff) | |
parent | dfa6dedad7a3741cc621669077304f44c2c79467 (diff) | |
download | pfsense-12ac39e824b1d45dd061cb436d77af17b2c6491c.zip pfsense-12ac39e824b1d45dd061cb436d77af17b2c6491c.tar.gz |
Merge remote branch 'upstream/master'
Conflicts:
conf.default/config.xml
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.start_packages | 2 | ||||
-rwxr-xr-x | etc/rc.stop_packages | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.start_packages b/etc/rc.start_packages index ddd288d..4b78718 100755 --- a/etc/rc.start_packages +++ b/etc/rc.start_packages @@ -61,7 +61,7 @@ if (is_array($config['installedpackages']['package'])) { $shell = @popen("/bin/sh", "w"); if ($shell) { - foreach ($rcfiles as $rcfile) { + foreach ($rcfiles as $rcfile => $number) { echo " Starting {$rcfile}..."; fwrite($shell, "{$rcfile} start >>/tmp/bootup_messages 2>&1 &"); echo "done.\n"; diff --git a/etc/rc.stop_packages b/etc/rc.stop_packages index 181d2ea..95e77fd 100755 --- a/etc/rc.stop_packages +++ b/etc/rc.stop_packages @@ -60,7 +60,7 @@ if (is_array($config['installedpackages']['package'])) { $shell = @popen("/bin/sh", "w"); if ($shell) { - foreach ($rcfiles as $rcfile) { + foreach ($rcfiles as $rcfile => $number) { echo " Stoping {$rcfile}..."; fwrite($shell, "{$rcfile} stop >>/tmp/bootup_messages 2>&1"); echo "done.\n"; |