make motd update conditional on an rc.conf variable (update_motd), and

move it before interactive logins are possible (just in case).
This commit is contained in:
perry 1997-04-23 01:24:22 +00:00
parent cbf5ef7c50
commit 889bcd37bc
2 changed files with 22 additions and 15 deletions

32
etc/rc
View File

@ -1,4 +1,4 @@
# $NetBSD: rc,v 1.73 1997/04/19 03:10:57 perry Exp $
# $NetBSD: rc,v 1.74 1997/04/23 01:24:22 perry Exp $
# originally from: @(#)rc 8.2 (Berkeley) 3/17/94
# System startup script run by init on autoboot
@ -251,6 +251,23 @@ echo clearing /tmp
find . ! -name . ! -name lost+found ! -name quota.user \
! -name quota.group -exec rm -rf -- {} \; -type d -prune)
# Update kernel info in /etc/motd
# Must be done *before* interactive logins are possible to prevent
# possible race conditions.
if [ "$update_motd" != NO ]; then
echo 'updating motd.'
if [ ! -f /etc/motd ]; then
install -c -o root -g wheel -m 664 /dev/null /etc/motd
fi
T=/tmp/_motd
rm -f $T
sysctl -n kern.version | sed 1q > $T
echo "" >> $T
sed '1,/^$/d' < /etc/motd >> $T
cmp -s $T /etc/motd || cp $T /etc/motd
rm -f $T
fi
if [ -f /var/account/acct ]; then
echo 'turning on accounting'; accton /var/account/acct
fi
@ -365,19 +382,6 @@ if [ "$kerberos_server" = YES ]; then
echo '.'
fi
# Hack the Message Of The Day
if [ ! -f /etc/motd ]; then
install -c -o root -g wheel -m 664 /dev/null /etc/motd
fi
T=/tmp/_motd
rm -f $T
sysctl -n kern.version | sed 1q > $T
echo "" >> $T
sed '1,/^$/d' < /etc/motd >> $T
cmp -s $T /etc/motd || cp $T /etc/motd
rm -f $T
. /etc/rc.local
date

View File

@ -1,4 +1,4 @@
# $NetBSD: rc.conf,v 1.8 1997/04/02 01:59:04 cjs Exp $
# $NetBSD: rc.conf,v 1.9 1997/04/23 01:24:23 perry Exp $
#
# see rc.conf(5) for more information.
@ -10,6 +10,9 @@
# `DEFAULT' enables a program with the default flags (as listed).
# Any other string is used as a set of flags.
# Actions to take on boot
update_motd=YES # YES or NO
# Programs run on boot
savecore_flags=DEFAULT # default: ""
lkm_init=YES # YES or NO.