diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-06-21 02:54:47 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-06-21 02:54:47 +0000 |
| commit | ac11ac6f2550cf48b72c06cd583d0e56251d281e (patch) | |
| tree | cd55a45aadec4812bdbc50d98e603886aded303f | |
| parent | c703dc3d4470bbcc4aaa1e8b8cd1146f581100a5 (diff) | |
Argh. Back out previous until correct diff found.
| -rw-r--r-- | distrib/miniroot/install.sub | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index a064e0105c2..95e8c421abb 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.603 2010/06/21 02:19:16 krw Exp $ +# $OpenBSD: install.sub,v 1.604 2010/06/21 02:54:46 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1619,9 +1619,8 @@ check_fs() { [[ $resp == y ]] && _f=f while read _dev _mp _fstype _rest; do - [[ $_dev == /dev/* ]] || continue - [[ $_dev != /dev/$ROOTDEV ]] || continue - [[ -f /sbin/fsck_$_fstype ]] || continue + [ "$_dev" != /dev/"$ROOTDEV" ] || continue + [ -f "/sbin/fsck_$_fstype" ] || continue # Make sure device exists before fsck'ing it. _rest=${_dev#/dev/} makedev ${_rest%[a-p]} || continue @@ -1634,7 +1633,7 @@ check_fs() { fi done </etc/fstab - [[ $_fail == y ]] && exit + [ "$_fail" ] && exit } # Extract fully qualified domain name from current hostname. If none is |