From 271e737f63c04a51c95a36feff56ba3a2780219e Mon Sep 17 00:00:00 2001 From: deraadt Date: Fri, 22 Apr 2022 17:25:10 +0000 Subject: [PATCH] checking for /mnt and /root in is_rootdisk() is excessively zealous, the remaining directory list is good enough ok sthen --- distrib/miniroot/install.sub | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 6c58c01a668..987be8f82be 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1193 2022/03/28 18:53:40 kettenis Exp $ +# $OpenBSD: install.sub,v 1.1194 2022/04/22 17:25:10 deraadt Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -2314,9 +2314,9 @@ is_rootdisk() { if disklabel $_d | grep -q '^ a: .*4\.2BSD ' && mount -t ffs -r /dev/${_d}a /mnt; then if $UU; then - ls -d /mnt/{auto_upgrade.conf,bin,dev,etc,home,mnt,root,sbin,tmp,usr,var} + ls -d /mnt/{auto_upgrade.conf,bin,dev,etc,home,sbin,tmp,usr,var} else - ls -d /mnt/{bin,dev,etc,home,mnt,root,sbin,tmp,usr,var} + ls -d /mnt/{bin,dev,etc,home,sbin,tmp,usr,var} fi _rc=$? umount /mnt -- 2.20.1