Browse Source

Use the new -s flag to mount the /usr and /var partitions. Avoids

doubly mounted mfs partitions. Also, at the end of the mount dance,
try mount all partitions, not just nfs partitions. Handles a case
where local paritition mounted inside a nfs partition where not
mounted by rc (/usr on nfs with a local /usr/obj, for example).
ok deraadt@ henning@
OPENBSD_4_0
otto 18 years ago
parent
commit
592916e5d3
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      src/etc/rc

+ 4
- 4
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.277 2006/01/12 21:54:15 deraadt Exp $
# $OpenBSD: rc,v 1.278 2006/03/12 20:07:48 otto Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -254,8 +254,8 @@ if [ X"${pf}" != X"NO" ]; then
fi fi
fi fi
mount /usr >/dev/null 2>&1
mount /var >/dev/null 2>&1
mount -s /usr >/dev/null 2>&1
mount -s /var >/dev/null 2>&1
# if there's no /var/db/host.random, make one through /dev/urandom # if there's no /var/db/host.random, make one through /dev/urandom
if [ ! -f /var/db/host.random ]; then if [ ! -f /var/db/host.random ]; then
@ -401,7 +401,7 @@ if [ X"${ntpd_flags}" != X"NO" ]; then
fi fi
echo '.' echo '.'
mount -a -t nfs
mount -a
swapctl -A -t noblk swapctl -A -t noblk


Loading…
Cancel
Save