* Remove the OS specific bits, since NetBSD isn't interested in
porting this stuff back. * Test /etc/motd for writability before trying to update it. This is especially useful when /etc/ is mounted ro, like on a diskless boot. (Thanks to phk for the idea on this one.) * Make the "updating" message reflect what actually happens.
This commit is contained in:
parent
76f9428757
commit
809a0e6290
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=121068
@ -16,14 +16,7 @@ rcvar="update_motd"
|
|||||||
start_cmd="motd_start"
|
start_cmd="motd_start"
|
||||||
stop_cmd=":"
|
stop_cmd=":"
|
||||||
|
|
||||||
case ${OSTYPE} in
|
PERMS="644"
|
||||||
FreeBSD)
|
|
||||||
PERMS="644"
|
|
||||||
;;
|
|
||||||
NetBSD)
|
|
||||||
PERMS="664"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
motd_start()
|
motd_start()
|
||||||
{
|
{
|
||||||
@ -31,28 +24,27 @@ motd_start()
|
|||||||
# Must be done *before* interactive logins are possible
|
# Must be done *before* interactive logins are possible
|
||||||
# to prevent possible race conditions.
|
# to prevent possible race conditions.
|
||||||
#
|
#
|
||||||
echo "Updating motd."
|
echo -n 'Updating motd'
|
||||||
if [ ! -f /etc/motd ]; then
|
if [ ! -f /etc/motd ]; then
|
||||||
install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd
|
install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case ${OSTYPE} in
|
if [ ! -w /etc/motd ]; then
|
||||||
FreeBSD)
|
echo ' ... /etc/motd is not writable, update failed.'
|
||||||
T=`mktemp -t motd`
|
return
|
||||||
uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T}
|
fi
|
||||||
awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T}
|
|
||||||
;;
|
T=`mktemp -t motd`
|
||||||
NetBSD)
|
uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T}
|
||||||
T='/etc/_motd'
|
awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T}
|
||||||
sysctl -n kern.version | while read i; do echo $i; break; done > $T
|
|
||||||
sed '1{/^NetBSD.*/{d;};};' < /etc/motd >> $T
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
cmp -s $T /etc/motd || {
|
cmp -s $T /etc/motd || {
|
||||||
cp $T /etc/motd
|
cp $T /etc/motd
|
||||||
chmod ${PERMS} /etc/motd
|
chmod ${PERMS} /etc/motd
|
||||||
}
|
}
|
||||||
rm -f $T
|
rm -f $T
|
||||||
|
|
||||||
|
echo .
|
||||||
}
|
}
|
||||||
|
|
||||||
load_rc_config $name
|
load_rc_config $name
|
||||||
|
Loading…
Reference in New Issue
Block a user