summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrpe <rpe@openbsd.org>2015-05-19 20:12:29 +0000
committerrpe <rpe@openbsd.org>2015-05-19 20:12:29 +0000
commit52b0aa0c66dbf82f6a5b945a23a943f26deca3a2 (patch)
treedabdca3a15e26db67a5e128cbed2bf7211d8d22c
parentimprove spacing in disklabel template. (diff)
downloadwireguard-openbsd-52b0aa0c66dbf82f6a5b945a23a943f26deca3a2.tar.xz
wireguard-openbsd-52b0aa0c66dbf82f6a5b945a23a943f26deca3a2.zip
Fix installing sets from cdrom if more than one drive is present.
Run makedev in install_cdrom() to create the necessary device nodes, which got lost in a recent change. Found by James Hartley, thanks for the bug report! OK krw@
-rw-r--r--distrib/miniroot/install.sub4
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 4d3e770579b..b21e0a746e5 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.839 2015/05/18 13:48:37 deraadt Exp $
+# $OpenBSD: install.sub,v 1.840 2015/05/19 20:12:29 rpe Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -1345,7 +1345,7 @@ install_mounted_fs() {
install_cdrom() {
local _drive=$1
- mount_mnt2 $_drive || return
+ makedev $_drive && mount_mnt2 $_drive || return
install_mounted_fs
}