summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrpe <rpe@openbsd.org>2013-12-27 23:43:39 +0000
committerrpe <rpe@openbsd.org>2013-12-27 23:43:39 +0000
commitf530fb179cec5bb9ce0915db52c60c99f1e19b06 (patch)
treedd2ba6269aefaffb426ff67d8913a63b1e799063
parentre-use random_seed in shutdown section (diff)
downloadwireguard-openbsd-f530fb179cec5bb9ce0915db52c60c99f1e19b06.tar.xz
wireguard-openbsd-f530fb179cec5bb9ce0915db52c60c99f1e19b06.zip
- add chmod of seedfile in /etc
- use its return code for single/multiuser detection ok deraadt
-rw-r--r--etc/rc7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc b/etc/rc
index 6f801a10b89..c55cf22efbe 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.416 2013/12/27 23:40:29 rpe Exp $
+# $OpenBSD: rc,v 1.417 2013/12/27 23:43:39 rpe Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -232,8 +232,9 @@ fi
if [ X"$1" = X"shutdown" ]; then
random_seed
- _c=$?
- if [ ${_c} -eq 0 ]; then
+ chmod 600 /etc/random.seed >/dev/null 2>&1
+ _notsingle=$? # root is writeable, so we are not single user??
+ if [ ${_notsingle} -eq 0 ]; then
if [ -n "${pkg_scripts}" ]; then
echo -n 'stopping package daemons:'
while [ -n "${pkg_scripts}" ]; do