diff options
| author |   krw <krw@openbsd.org> | 2009-06-01 02:57:40 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2009-06-01 02:57:40 +0000 |
| commit | f8ea3e2a6d0dc6877cae4f4b0dda89a28fbcba61 (patch) | |
| tree | 8bc9dde055c22363ae3d93658dd675dfc1ad7f79 | |
| parent | Add Naturetech as a possible hardware vendor. (diff) | |
| download | wireguard-openbsd-f8ea3e2a6d0dc6877cae4f4b0dda89a28fbcba61.tar.xz wireguard-openbsd-f8ea3e2a6d0dc6877cae4f4b0dda89a28fbcba61.zip | |
Test the return value of md_prep_disklabel() to detect failed
attempts to write a disklabel. When failure is detected don't
configure the disk, return it to the list of disks available to be
configured.
| -rw-r--r-- | distrib/miniroot/install.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index f7a28c63d05..4c2574e5921 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.197 2009/05/31 18:38:42 deraadt Exp $ +# $OpenBSD: install.sh,v 1.198 2009/06/01 02:57:40 krw Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -94,7 +94,7 @@ if [[ ! -f /etc/fstab ]]; then # fstab.$DISK is created here with 'disklabel -f'. rm -f *.$DISK AUTOROOT=n - md_prep_disklabel $DISK + md_prep_disklabel $DISK || { DISK= ; continue ; } # Make sure there is a '/' mount point. grep -qs " / ffs " fstab.$ROOTDISK || \ |