From dfc4014326f854099d3b53c776ff0aead937c7ff Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 27 Mar 2023 06:15:43 +0000 Subject: [PATCH] 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. --- distrib/miniroot/install.sub | 12 ++++++++---- 1 file 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 @@ -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 -- 2.20.1