summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2017-06-27 03:42:01 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2017-06-27 03:42:01 +0000
commit88bbd3ace4e58c217f7e593306fda226aa8fe161 (patch)
treedf4458ea243a4fad1a8b7319a596df22cc0bf81e
parentd0b7cb2ee69aedbc8b6946587071e4d78d8767f1 (diff)
remove some old cruft.
-rw-r--r--etc/rc10
1 files changed, 2 insertions, 8 deletions
diff --git a/etc/rc b/etc/rc
index ddc99a10fa7..b1bcd2be844 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.504 2017/06/22 16:03:36 deraadt Exp $
+# $OpenBSD: rc,v 1.505 2017/06/27 03:42:00 tedu Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -381,7 +381,7 @@ ln -fh /bsd /bsd.booted
rm -f /fastboot
-# Set flags on ttys. (Do early, in case they use tty for SLIP in netstart.)
+# Set flags on ttys.
echo 'setting tty flags'
ttyflags -a
@@ -434,12 +434,6 @@ echo 'starting network'
# Prevents carp from preempting until the system is booted.
ifconfig -g carp carpdemote 128
-# Recover resolv.conf in case dhclient died hard.
-if [[ -f /etc/resolv.conf.save ]]; then
- mv -f /etc/resolv.conf.save /etc/resolv.conf
- touch /etc/resolv.conf
-fi
-
sh /etc/netstart
# Any write triggers a rekey.