summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-08-05 06:38:56 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-08-05 06:38:56 +0000
commitf4f71cc9bbbca46762720bc7fd28a23e7f859668 (patch)
tree204acc59c18f38de350a7c0aca8b43995155db17
parent8c5124abdef97b8cf993e14eed7c7721e3c5fd45 (diff)
host.random whacking must be after /var is mounted, obviously
-rw-r--r--etc/rc26
1 files changed, 13 insertions, 13 deletions
diff --git a/etc/rc b/etc/rc
index b9c43fd61ca..714aa2989ab 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.148 2000/07/13 16:26:13 millert Exp $
+# $OpenBSD: rc,v 1.149 2000/08/05 06:38:55 deraadt Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -112,18 +112,6 @@ rm -f /fastboot # XXX (root now writeable)
echo 'setting tty flags'
ttyflags -a
-# if there's no /var/db/host.random, make one through /dev/urandom
-if [ ! -f /var/db/host.random ]; then
- dd if=/dev/urandom of=/var/db/host.random bs=1024 count=64 \
- >/dev/null 2>&1
- chmod 600 /var/db/host.random >/dev/null 2>&1
-else
- dd if=/var/db/host.random of=/dev/urandom bs=1024 count=64 \
- > /dev/null 2>&1
- dd if=/var/db/host.random of=/dev/arandom bs=1024 count=64 \
- > /dev/null 2>&1
-fi
-
if [ -f /etc/sysctl.conf ]; then
(
# delete comments and blank lines
@@ -142,6 +130,18 @@ echo 'starting network'
mount /usr >/dev/null 2>&1
mount /var >/dev/null 2>&1
+# if there's no /var/db/host.random, make one through /dev/urandom
+if [ ! -f /var/db/host.random ]; then
+ dd if=/dev/urandom of=/var/db/host.random bs=1024 count=64 \
+ >/dev/null 2>&1
+ chmod 600 /var/db/host.random >/dev/null 2>&1
+else
+ dd if=/var/db/host.random of=/dev/urandom bs=1024 count=64 \
+ > /dev/null 2>&1
+ dd if=/var/db/host.random of=/dev/arandom bs=1024 count=64 \
+ > /dev/null 2>&1
+fi
+
# clean up left-over files
rm -f /etc/nologin
rm -f /var/spool/lock/LCK.*