diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-07-09 18:35:37 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-07-09 20:58:07 +0200 |
| commit | 7e558f163df566e4bacdf5ea90c70b4a1986e6c2 (patch) | |
| tree | 2fa38558cf2bb198117c162b6b1be9f38744a31f /source/installer/sources | |
| parent | a59816a829a8276341c1053a594715c234b3b64b (diff) | |
| download | current-7e558f163df566e4bacdf5ea90c70b4a1986e6c2.tar.gz current-7e558f163df566e4bacdf5ea90c70b4a1986e6c2.tar.xz | |
Sun Jul 9 18:35:37 UTC 202320230709183537
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.
Diffstat (limited to 'source/installer/sources')
| -rwxr-xr-x | source/installer/sources/initrd/sbin/mkbindmounts | 6 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/setup | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/installer/sources/initrd/sbin/mkbindmounts b/source/installer/sources/initrd/sbin/mkbindmounts index 40a9d7313..e5c95c0f1 100755 --- a/source/installer/sources/initrd/sbin/mkbindmounts +++ b/source/installer/sources/initrd/sbin/mkbindmounts @@ -5,6 +5,6 @@ # reinstall boot loaders). mkdir -p /mnt/{dev,proc,sys} -mount -o bind /dev /mnt/dev -mount -o bind /proc /mnt/proc -mount -o bind /sys /mnt/sys +mount -o rbind /dev /mnt/dev +mount -o rbind /proc /mnt/proc +mount -o rbind /sys /mnt/sys 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 |