From f4a16dfaa3822cd84790612cfb5f6794e7397ea1 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 23 Jan 2019 04:39:04 +0000
Subject: Wed Jan 23 04:39:04 UTC 2019

a/kernel-generic-4.19.17-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.17-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.17-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.17-x86-1.txz:  Upgraded.
d/scons-3.0.4-x86_64-1.txz:  Upgraded.
d/vala-0.42.5-x86_64-1.txz:  Upgraded.
k/kernel-source-4.19.17-noarch-1.txz:  Upgraded.
n/httpd-2.4.38-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  mod_session: mod_session_cookie does not respect expiry time allowing
  sessions to be reused.  [Hank Ibell]
  mod_http2: fixes a DoS attack vector. By sending slow request bodies
  to resources not consuming them, httpd cleanup code occupies a server
  thread unnecessarily. This was changed to an immediate stream reset
  which discards all stream state and incoming data.  [Stefan Eissing]
  mod_ssl: Fix infinite loop triggered by a client-initiated
  renegotiation in TLSv1.2 (or earlier) with OpenSSL 1.1.1 and
  later.  PR 63052.  [Joe Orton]
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-17199
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-17189
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-0190
  (* Security fix *)
x/libdrm-2.4.97-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/installer/sources/initrd/usr/lib/setup/setup | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup
index 7932feca..54334477 100755
--- a/source/installer/sources/initrd/usr/lib/setup/setup
+++ b/source/installer/sources/initrd/usr/lib/setup/setup
@@ -74,8 +74,13 @@ T_PX="/mnt"
 echo "$T_PX" > $TMP/SeTT_PX
 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
- umount /var/log/mount                                          # location
+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
+ # Unmount target partition:
+ umount /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
@@ -326,6 +331,10 @@ to choose packages individually." 4 60
  fi
 
  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
   SeTconfig
   REPLACE_FSTAB=Y
   if [ -r $TMP/SeTnative ]; then
-- 
cgit v1.2.3