diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-05-30 18:29:31 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-05-30 18:29:31 +0000 |
commit | fc6b5a4d9e77ba834d725d6f2a4259f9d1b48921 (patch) | |
tree | 76f802dab1d882df420159c0ace6f9c8b96cd2fa /etc | |
parent | 74dbce1fa87062d286b9f968630a19c0738a5580 (diff) | |
download | pfsense-fc6b5a4d9e77ba834d725d6f2a4259f9d1b48921.zip pfsense-fc6b5a4d9e77ba834d725d6f2a4259f9d1b48921.tar.gz |
More bootup cleanups
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/services.inc | 3 | ||||
-rwxr-xr-x | etc/rc | 10 | ||||
-rwxr-xr-x | etc/rc.bootup | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 3bbd1c9..8ea7139 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -172,8 +172,7 @@ EOD; mwexec("/usr/local/sbin/dhcpd -cf {$g['varetc_path']}/dhcpd.conf " . join(" ", $dhcpdifs)); - if (!$g['booting']) { - //filter_configure(); + if ($g['booting']) { print "done.\n"; } @@ -84,7 +84,7 @@ if [ "$DEVFS" = "0" ]; then mount_devfs devfs /dev fi -echo -n "Syncing master.passwd..." +echo -n "Syncing master.passwd... " /usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd echo "done." @@ -105,19 +105,19 @@ cd /var/run && cp /dev/null utmp && chmod 644 utmp echo -n Starting Secure Shell Services... /etc/sshd -echo -n "Starting USB..." +echo -n "Starting USB... " /usr/sbin/usbd 2>>/tmp/bootup_messages -echo Done. +echo "done." /usr/sbin/cron 2>>/tmp/bootup_messages /etc/rc.packages -echo "Executing rc.d items..." +echo "Executing rc.d items... " for FILE in /usr/local/etc/rc.d/*.sh; do echo -n " Starting ${FILE}..." sh $FILE >>/tmp/bootup_messages 2>&1 - echo "Done." + echo "done." done if [ -f /tmp/filter_boot_dirty ]; then diff --git a/etc/rc.bootup b/etc/rc.bootup index 6dd3bb3..337e26b 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -128,7 +128,7 @@ echo "done.\n"; /* set up Optional interfaces */ - echo "Configuring OPT interfaces..."; + echo "Configuring OPT interfaces... "; mute_kernel_msgs(); interfaces_optional_configure(); unmute_kernel_msgs(); @@ -143,7 +143,7 @@ filter_pflog_start(); /* setup altq + pf */ - echo "Configuring firewall..."; + echo "Configuring firewall... "; mute_kernel_msgs(); filter_configure(); unmute_kernel_msgs(); |