diff options
| author |   halex <halex@openbsd.org> | 2013-06-04 00:42:23 +0000 |
|---|---|---|
| committer | halex <halex@openbsd.org> | 2013-06-04 00:42:23 +0000 |
| commit | a8f40ea1c75c147ca9bc919d025d796e1851b0fd (patch) | |
| tree | f971233f71d63719b17a837c763e4d23567bc862 | |
| parent | fix some minor issues before proceeding with the remaining patches from (diff) | |
| download | wireguard-openbsd-a8f40ea1c75c147ca9bc919d025d796e1851b0fd.tar.xz wireguard-openbsd-a8f40ea1c75c147ca9bc919d025d796e1851b0fd.zip | |
supress errors that would occur if bioctl is missing or is run with an
unsupported disk as argument (e.g. wd*)
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index ad465d96a0a..22441438ff5 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.679 2013/06/02 14:55:39 halex Exp $ +# $OpenBSD: install.sub,v 1.680 2013/06/04 00:42:23 halex 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 @@ -1941,7 +1941,7 @@ finish_up() { # In case this is a softraid device, make sure all underlying # device nodes exist. - makedev $(bioctl $ROOTDISK | sed -n 's/.*<\(.*\)>$/\1/p') + makedev $(bioctl $ROOTDISK 2>/dev/null | sed -n 's/.*<\(.*\)>$/\1/p') md_installboot $ROOTDISK if [[ -f /mnt/bsd.mp ]] && ((NCPU > 1)); then |