summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2023-03-27 06:15:44 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2023-03-27 06:15:44 +0000
commit12e2900cc49b24d89fc229dd3c8b5ef72791607a (patch)
tree3b6cfd18c0ed209afc374be09e7c867fbd8624a8 /distrib/miniroot
parent266b7a29903480dc6b74fd8e8eafe5bbd5d97dae (diff)
Revert r1.1235, "simplify final MAKEDEV call"
While MAKEDEV accepts multiple args, it complains loudly on repeated args. It is silent when trying to create a single already existing device. This is probably a bug in MAKEDEV.
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub12
1 files changed, 8 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 5d60c2f5dc4..b8dc731b581 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.1235 2023/03/25 18:27:28 kn Exp $
+# $OpenBSD: install.sub,v 1.1236 2023/03/27 06:15:43 tb Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2931,9 +2931,13 @@ finish_up() {
fi
echo -n "Making all device nodes..."
- # Make sure any devices we found during probe are created in the
- # installed system.
- (cd /mnt/dev; sh MAKEDEV $(get_dkdevs) $(get_cddevs) all)
+ (cd /mnt/dev; sh MAKEDEV all
+ # Make sure any devices we found during probe are created in the
+ # installed system.
+ for _dev in $(get_dkdevs) $(get_cddevs); do
+ sh MAKEDEV $_dev
+ done
+ )
echo " done."
# We may run some programs in chroot, and some of them might be