summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2019-04-01 06:59:36 +0000
committertedu <tedu@openbsd.org>2019-04-01 06:59:36 +0000
commit3b14d2e9efa42ab6d3c90efd75cae750b845f594 (patch)
treeea821a53e45bdbae3c482d5793af0e4f2d4b7baf
parentmark ERR_R_INTERNAL_ERROR instead of assert or _exit, sigh (diff)
downloadwireguard-openbsd-3b14d2e9efa42ab6d3c90efd75cae750b845f594.tar.xz
wireguard-openbsd-3b14d2e9efa42ab6d3c90efd75cae750b845f594.zip
catch/hide errors from ifconfig carp in case there is no carp.
ok deraadt
-rw-r--r--etc/rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc b/etc/rc
index a3ce6e3c0ef..8ea08880b4e 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.534 2019/02/24 12:57:14 kn Exp $
+# $OpenBSD: rc,v 1.535 2019/04/01 06:59:36 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
@@ -437,7 +437,7 @@ echo 'starting network'
# Set carp interlock by increasing the demotion counter.
# Prevents carp from preempting until the system is booted.
-ifconfig -g carp carpdemote 128
+ifconfig -g carp carpdemote 128 >/dev/null 2>&1
sh /etc/netstart
@@ -603,7 +603,7 @@ fi
[[ -f /etc/rc.local ]] && sh /etc/rc.local
# Disable carp interlock.
-ifconfig -g carp -carpdemote 128
+ifconfig -g carp -carpdemote 128 >/dev/null 2>&1
mixerctl_conf