From 7e558f163df566e4bacdf5ea90c70b4a1986e6c2 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 9 Jul 2023 18:35:37 +0000
Subject: Sun Jul  9 18:35:37 UTC 2023

ap/qpdf-11.5.0-x86_64-1.txz:  Upgraded.
kde/kid3-3.9.4-x86_64-1.txz:  Upgraded.
l/harfbuzz-8.0.0-x86_64-1.txz:  Upgraded.
l/xapian-core-1.4.23-x86_64-1.txz:  Upgraded.
n/gpgme-1.21.0-x86_64-1.txz:  Upgraded.
---
 source/installer/sources/initrd/usr/lib/setup/setup | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source/installer/sources/initrd/usr')

diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup
index 94b8a41a1..6eb96dc3a 100755
--- a/source/installer/sources/initrd/usr/lib/setup/setup
+++ b/source/installer/sources/initrd/usr/lib/setup/setup
@@ -80,11 +80,11 @@ ROOT_DEVICE="`mount | grep "on / " | cut -f 1 -d ' '`"
 echo "$ROOT_DEVICE" > $TMP/SeTrootdev
 if mount | grep /var/log/mount 1> /dev/null 2> /dev/null ; then # clear source location:
  # In case of bind mounts, try to unmount them first:
- umount /var/log/mount/dev 2> /dev/null
- umount /var/log/mount/proc 2> /dev/null
- umount /var/log/mount/sys 2> /dev/null
+ umount -R /var/log/mount/dev 2> /dev/null
+ umount -R /var/log/mount/proc 2> /dev/null
+ umount -R /var/log/mount/sys 2> /dev/null
  # Unmount target partition:
- umount /var/log/mount
+ umount -R /var/log/mount
 fi
 # Anything mounted on /var/log/mount now is a fatal error:
 if mount | grep /var/log/mount 1> /dev/null 2> /dev/null ; then
@@ -340,9 +340,9 @@ to choose packages individually." 4 60
 
  if [ "$MAINSELECT" = "CONFIGURE" ]; then
   # Make bind mounts for /dev, /proc, and /sys:
-  mount -o bind /dev $T_PX/dev 2> /dev/null
-  mount -o bind /proc $T_PX/proc 2> /dev/null
-  mount -o bind /sys $T_PX/sys 2> /dev/null
+  mount -o rbind /dev $T_PX/dev 2> /dev/null
+  mount -o rbind /proc $T_PX/proc 2> /dev/null
+  mount -o rbind /sys $T_PX/sys 2> /dev/null
   SeTconfig
   REPLACE_FSTAB=Y
   if [ -r $TMP/SeTnative ]; then
@@ -392,7 +392,7 @@ if mount | grep /var/log/mntiso 1> /dev/null 2> /dev/null ; then
  umount -f /var/log/mntiso
 fi
 if mount | grep /var/log/mount 1> /dev/null 2> /dev/null ; then
- umount /var/log/mount
+ umount -R /var/log/mount
 fi
 # Anything mounted on /var/log/mount now is a fatal error:
 if mount | grep /var/log/mount 1> /dev/null 2> /dev/null ; then
-- 
cgit v1.2.3