Browse Source

use mv -f to avoid stopping during wrongly mounted root; sbeyer@reactor.de

OPENBSD_4_7
deraadt 15 years ago
parent
commit
be99f93d5d
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      src/etc/rc

+ 2
- 2
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.333 2009/11/23 12:14:25 deraadt Exp $
# $OpenBSD: rc,v 1.334 2009/12/04 21:58:41 deraadt 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.
@ -292,7 +292,7 @@ sysctl_conf
echo 'starting network' echo 'starting network'
ifconfig -g carp carpdemote 128 ifconfig -g carp carpdemote 128
if [ -f /etc/resolv.conf.save ]; then if [ -f /etc/resolv.conf.save ]; then
mv /etc/resolv.conf.save /etc/resolv.conf
mv -f /etc/resolv.conf.save /etc/resolv.conf
touch /etc/resolv.conf touch /etc/resolv.conf
fi fi
. /etc/netstart . /etc/netstart


Loading…
Cancel
Save