diff options
| author |   deraadt <deraadt@openbsd.org> | 2009-12-04 21:58:41 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2009-12-04 21:58:41 +0000 |
| commit | 7d2d953cd473a78ca3764c53ec3efd28d44f6aa5 (patch) | |
| tree | c324e318aa90d878fd533c84e5de5c8c10d3d5bf | |
| parent | calculate the number of frames per usb xfer only once, and take into (diff) | |
| download | wireguard-openbsd-7d2d953cd473a78ca3764c53ec3efd28d44f6aa5.tar.xz wireguard-openbsd-7d2d953cd473a78ca3764c53ec3efd28d44f6aa5.zip | |
use mv -f to avoid stopping during wrongly mounted root; sbeyer@reactor.de
| -rw-r--r-- | etc/rc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 # or after single-user. @@ -292,7 +292,7 @@ sysctl_conf echo 'starting network' ifconfig -g carp carpdemote 128 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 fi . /etc/netstart |