summaryrefslogtreecommitdiffstats
path: root/etc/rc.d/motd
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2009-10-10 22:17:03 +0000
committerdougb <dougb@FreeBSD.org>2009-10-10 22:17:03 +0000
commit1eae783464889ce2c3e196e469e50fbc82f1a017 (patch)
treef49c4e3cc88efec4813ca1f389f8f77eca5d2ba0 /etc/rc.d/motd
parent2c9565c3a66667195e5ea0136795c947f511fbfc (diff)
downloadFreeBSD-src-1eae783464889ce2c3e196e469e50fbc82f1a017.zip
FreeBSD-src-1eae783464889ce2c3e196e469e50fbc82f1a017.tar.gz
In regards to the "Starting foo:" type messages at boot time, create and
employ a more generic solution, and use it in the individual rc.d scripts that also have an $rc_quiet test: 1. Add check_startmsgs() to rc.subr. 2. In the rc.d scripts that use rc_quiet (and rc.subr) substitute variations of [ -z "$rc_quiet" ] with check_startmsgs 3. In savecore add a trailing '.' to the end of the message to make it more consistent with other scripts. 4. In newsyslog remove a : before the terminal '.' since we do not expect there to be anything printed out in between to make it more consistent. 5. In the following scripts change "quotes" to 'quotes' where no variables exist in the message: savecore pf newsyslog 6. In the following scripts substitute if/then/fi for the simpler (and more consistent) check_startmsgs &&: faith stf 7. In the following scripts separate the "Starting foo:" from the terminal '.' to make them more consistent: moused hostname pf 8. In nfsclient move the message to its own line to avoid a style bug 9. In pf rc_quiet does not apply to the _stop method, so remove the test there. 10. In motd add 'quotes' around the terminal '.' for consistency
Diffstat (limited to 'etc/rc.d/motd')
-rwxr-xr-xetc/rc.d/motd4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.d/motd b/etc/rc.d/motd
index 0b6707a..8256d96 100755
--- a/etc/rc.d/motd
+++ b/etc/rc.d/motd
@@ -22,7 +22,7 @@ motd_start()
# Must be done *before* interactive logins are possible
# to prevent possible race conditions.
#
- [ -z "${rc_quiet}" ] && echo -n 'Updating motd:'
+ check_startmsgs && echo -n 'Updating motd:'
if [ ! -f /etc/motd ]; then
install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd
fi
@@ -42,7 +42,7 @@ motd_start()
}
rm -f $T
- [ -z "${rc_quiet}" ] && echo .
+ check_startmsgs && echo '.'
}
load_rc_config $name
OpenPOWER on IntegriCloud