summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrpe <rpe@openbsd.org>2015-07-20 06:59:39 +0000
committerrpe <rpe@openbsd.org>2015-07-20 06:59:39 +0000
commit5116749b9c313a4e8b0b8a7c5df070e34009eaf0 (patch)
tree56729ac36472137f7db4e1ef29abe604e236a0c9
parentadd NetLock Kft. CA root certificate, already present in web browsers and (diff)
downloadwireguard-openbsd-5116749b9c313a4e8b0b8a7c5df070e34009eaf0.tar.xz
wireguard-openbsd-5116749b9c313a4e8b0b8a7c5df070e34009eaf0.zip
Disable Strict Bourne shell mode for /etc/rc and /etc/netstart to be
able to use ksh syntax within these scripts. This way init doesn't need to be changed, which starts /etc/rc using /bin/sh and people can still use "sh /etc/netstart ifname". Idea from and OK halex@ OK deraadt@ krw@ guenther@
-rw-r--r--etc/netstart5
-rw-r--r--etc/rc5
2 files changed, 8 insertions, 2 deletions
diff --git a/etc/netstart b/etc/netstart
index 4832fa31995..27999ba40a3 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,9 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.152 2015/07/19 23:42:58 florian Exp $
+# $OpenBSD: netstart,v 1.153 2015/07/20 06:59:39 rpe Exp $
+
+# Turn off Strict Bourne shell mode.
+set +o sh
# Strip comments (and leading/trailing whitespace if IFS is set) from a file
# and spew to stdout.
diff --git a/etc/rc b/etc/rc
index dd065cc426b..5cf41da1a0e 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,9 +1,12 @@
-# $OpenBSD: rc,v 1.453 2015/07/19 04:44:36 rpe Exp $
+# $OpenBSD: rc,v 1.454 2015/07/20 06:59:39 rpe 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
# controlling terminal.
+# Turn off Strict Bourne shell.
+set +o sh
+
# Subroutines (have to come first).