diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-05-30 17:50:25 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-05-30 17:50:25 +0000 |
| commit | deebaae1dddec7600dea6a66fd5019f2141dcef2 (patch) | |
| tree | 71e822cd95e80fdef8450ffceab391a5a7ddbc2a | |
| parent | bde35c07533bd24a46200edcbe4e9603af966787 (diff) | |
| download | pfsense-deebaae1dddec7600dea6a66fd5019f2141dcef2.zip pfsense-deebaae1dddec7600dea6a66fd5019f2141dcef2.tar.gz | |
Make all startup commands uniform by correctly outputing when they are done.
Example:
Starting DHCP service...done.
| -rw-r--r-- | etc/inc/config.inc | 2 | ||||
| -rw-r--r-- | etc/inc/interfaces.inc | 4 | ||||
| -rw-r--r-- | etc/inc/services.inc | 5 | ||||
| -rwxr-xr-x | etc/rc | 3 | ||||
| -rwxr-xr-x | etc/rc.bootup | 3 |
5 files changed, 11 insertions, 6 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 6de395f..ee6653c 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1012,7 +1012,7 @@ function cleanup_backupcache($revisions = "all") { } if($g['booting']) { if($i) { - print ".\n"; + print "done.\n"; } } } diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 93dde2d..63cc8e5 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -299,6 +299,10 @@ function interfaces_carp_configure() { } } unmute_kernel_msgs(); + if ($g['booting']) { + echo "done.\n"; + unmute_kernel_msgs(); + } } function interfaces_carp_bringup() { diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 4abd76f..3bbd1c9 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -173,7 +173,8 @@ EOD; join(" ", $dhcpdifs)); if (!$g['booting']) { - filter_configure(); + //filter_configure(); + print "done.\n"; } return 0; @@ -268,8 +269,6 @@ function services_dhcrelay_configure() { if (!$g['booting']) { filter_configure(); - } else { - echo "done.\n"; } return 0; @@ -84,8 +84,9 @@ if [ "$DEVFS" = "0" ]; then mount_devfs devfs /dev fi -echo Syncing master.passwd... +echo -n "Syncing master.passwd..." /usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd +echo "done." # Create an initial utmp file cd /var/run && cp /dev/null utmp && chmod 644 utmp diff --git a/etc/rc.bootup b/etc/rc.bootup index 144b7cb..f32eaea 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -127,10 +127,11 @@ print "done.\n"; /* set up Optional interfaces */ - print "Configuring OPT interfaces...\n"; + print "Configuring OPT interfaces..."; mute_kernel_msgs(); interfaces_optional_configure(); unmute_kernel_msgs(); + print "done.\n"; /* setup carp interfaces */ interfaces_carp_configure(); |
