summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2010-11-08 19:44:36 +0000
committerajacoutot <ajacoutot@openbsd.org>2010-11-08 19:44:36 +0000
commit636d74c56b818703b4e36fcaa03a3beb6d69f3bb (patch)
tree7e3869d5131347f33c067c5f25e76524b78bb587
parentAdd %F, %g, %G, %u, %z (extended) and %Z. (diff)
downloadwireguard-openbsd-636d74c56b818703b4e36fcaa03a3beb6d69f3bb.tar.xz
wireguard-openbsd-636d74c56b818703b4e36fcaa03a3beb6d69f3bb.zip
Don't print 'Null message body; hope that's ok' in the rc output if the
call to rc.firstime doesn't output anything to mail(1). ok deraadt@ halex@
-rw-r--r--etc/rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index ee5e04b2a3b..369cb4aa14b 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.344 2010/11/02 18:59:12 deraadt Exp $
+# $OpenBSD: rc,v 1.345 2010/11/08 19:44:36 ajacoutot Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -825,7 +825,7 @@ fi
# If rc.firstime exists, run it just once, and make sure it is deleted
if [ -f /etc/rc.firsttime ]; then
mv /etc/rc.firsttime /etc/rc.firsttime.run
- . /etc/rc.firsttime.run 2>&1 | mail -s 'rc.firsttime output' root
+ . /etc/rc.firsttime.run 2>&1 | mail -s 'rc.firsttime output' root >/dev/null
fi
rm -f /etc/rc.firsttime.run