diff options
author | Robert Peichaer <rpe@cvs.openbsd.org> | 2015-07-01 21:12:50 +0000 |
---|---|---|
committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2015-07-01 21:12:50 +0000 |
commit | 9589f51c4383f13628f2e47eabb01d0654c41c1f (patch) | |
tree | 958849f7c7eef3e141dc46becf0a74fe603eac35 /distrib/miniroot/dot.profile | |
parent | a409459451f747f8652bab2644fed0f21e40797c (diff) |
Use ksh style tests like in the rest of the installer scripts.
OK krw@ halex@
Diffstat (limited to 'distrib/miniroot/dot.profile')
-rw-r--r-- | distrib/miniroot/dot.profile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/distrib/miniroot/dot.profile b/distrib/miniroot/dot.profile index e87efe08dbf..66aef1ecb03 100644 --- a/distrib/miniroot/dot.profile +++ b/distrib/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.27 2015/03/28 00:03:05 rpe Exp $ +# $OpenBSD: dot.profile,v 1.28 2015/07/01 21:12:49 rpe Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 2009 Kenneth R. Westerback @@ -47,7 +47,7 @@ set -o emacs set -- $(dmesg | sed -n '/^root on /h;${g;p;}') rootdisk=$3 -if [ "X${DONEPROFILE}" = "X" ]; then +if [[ -z $DONEPROFILE ]]; then DONEPROFILE=YES mount -u /dev/${rootdisk:-rd0a} / @@ -69,9 +69,9 @@ __EOT # after a timeout, but only the very first time around. timeout=false timer_pid= - if [ ! -f /tmp/noai ] && { ifconfig netboot >/dev/null 2>&1 || - [ -f /auto_install.conf ] || - [ -f /auto_upgrade.conf ]; }; then + if [[ ! -f /tmp/noai ]] && { ifconfig netboot >/dev/null 2>&1 || + [[ -f /auto_install.conf ]] || + [[ -f /auto_upgrade.conf ]]; }; then echo "Starting non-interactive mode in 5 seconds..." >/tmp/noai @@ -102,7 +102,7 @@ __EOT REPLY=a else # User has made a choice; stop the read timeout. - [ -n "$timer_pid" ] && kill $timer_pid 2>/dev/null + [[ -n $timer_pid ]] && kill $timer_pid 2>/dev/null timer_pid= fi |