From 30130016eed435a8530c1583fefe1ab8d19d1d50 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 11 Mar 2024 18:29:55 +0000
Subject: Mon Mar 11 18:29:55 UTC 2024

a/dialog-1.3_20240307-x86_64-1.txz:  Upgraded.
l/libpaper-2.2.3-x86_64-1.txz:  Upgraded.
l/libqalculate-5.0.0-x86_64-1.txz:  Upgraded.
l/pyparsing-3.1.2-x86_64-1.txz:  Upgraded.
l/python-packaging-24.0-x86_64-1.txz:  Upgraded.
n/openssh-9.7p1-x86_64-1.txz:  Upgraded.
  Future deprecation notice
  OpenSSH plans to remove support for the DSA signature algorithm in
  early 2025 and compile-time disable it later this year.
n/wget-1.24.5-x86_64-1.txz:  Upgraded.
x/iceauth-1.0.10-x86_64-1.txz:  Upgraded.
x/libXaw-1.0.16-x86_64-1.txz:  Upgraded.
xap/xaos-4.3.2-x86_64-1.txz:  Upgraded.
---
 source/installer/sources/initrd/sbin/mkbindmounts       | 4 ++++
 source/installer/sources/initrd/usr/lib/setup/SeTconfig | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'source/installer/sources')

diff --git a/source/installer/sources/initrd/sbin/mkbindmounts b/source/installer/sources/initrd/sbin/mkbindmounts
index e5c95c0f1..897889847 100755
--- a/source/installer/sources/initrd/sbin/mkbindmounts
+++ b/source/installer/sources/initrd/sbin/mkbindmounts
@@ -8,3 +8,7 @@ mkdir -p /mnt/{dev,proc,sys}
 mount -o rbind /dev /mnt/dev
 mount -o rbind /proc /mnt/proc
 mount -o rbind /sys /mnt/sys
+# Needed for EFI boot menu operations:
+if [ -d /sys/firmware/efi/efivars ]; then
+  mount -o rbind /sys/firmware/efi/efivars /mnt/sys/firmware/efi/efivars
+fi
diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTconfig b/source/installer/sources/initrd/usr/lib/setup/SeTconfig
index 6731019bb..b51e991dc 100755
--- a/source/installer/sources/initrd/usr/lib/setup/SeTconfig
+++ b/source/installer/sources/initrd/usr/lib/setup/SeTconfig
@@ -43,6 +43,10 @@ if [ ! "$T_PX" = "/" ]; then
   mount --bind /proc $T_PX/proc 1> /dev/null 2> /dev/null
   mount --bind /sys $T_PX/sys 1> /dev/null 2> /dev/null
   mount --bind /dev $T_PX/dev 1> /dev/null 2> /dev/null
+  # Needed for EFI boot menu operations:
+  if [ -d /sys/firmware/efi/efivars ]; then
+    mount --bind /sys/firmware/efi/efivars $T_PX/sys/firmware/efi/efivars 1> /dev/null 2> /dev/null
+  fi
 fi
 # These will be left connected rather than unmounting them to
 # make it easier to set up LVM/LUKS.
-- 
cgit v1.2.3