summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2016-11-04 22:12:47 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2016-11-04 22:12:47 +0000
commit0c572bc94bf88665b6d70cb01ec3f72bee9c2c6a (patch)
treebf8d1365ec39d9382c116a17c19a60d6aed55552 /etc
parent3b57184b869e4fdb20d572856e5c80ebe5aa9e7d (diff)
spacing
Diffstat (limited to 'etc')
-rw-r--r--etc/rc4
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/rc b/etc/rc
index 2b9de7d8585..f770d8e491a 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.490 2016/10/07 05:47:24 otto Exp $
+# $OpenBSD: rc,v 1.491 2016/11/04 22:12:46 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
@@ -220,7 +220,9 @@ reorder_libs() {
# Usage: run_upgrade_script firsttime|sysmerge
run_upgrade_script() {
local _suffix=$1
+
[[ -n $_suffix ]] || return 1
+
if [[ -f /etc/rc.$_suffix ]]; then
mv /etc/rc.$_suffix /etc/rc.$_suffix.run
. /etc/rc.$_suffix.run 2>&1 | tee /dev/tty |