From 0f53ad5c82efc7a2f115f79e9ff3d55b18c4ca46 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 30 Jun 2023 20:20:35 +0000
Subject: Fri Jun 30 20:20:35 UTC 2023

a/util-linux-2.39.1-x86_64-2.txz:  Rebuilt.
  Since libmount has dropped support for the traditional /etc/mtab file, if
  we find one replace it with a symlink to /proc/mounts.
kde/digikam-8.0.0-x86_64-4.txz:  Rebuilt.
  Recompiled against opencv-4.8.0.
kde/kirigami-addons-0.9.0-x86_64-1.txz:  Upgraded.
l/glib-networking-2.76.1-x86_64-1.txz:  Upgraded.
l/gst-plugins-bad-free-1.22.4-x86_64-2.txz:  Rebuilt.
  Recompiled against opencv-4.8.0.
l/gvfs-1.50.5-x86_64-1.txz:  Upgraded.
l/libpaper-2.1.1-x86_64-1.txz:  Upgraded.
l/libwebp-1.3.1-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.91-x86_64-1.txz:  Upgraded.
l/netpbm-11.03.00-x86_64-1.txz:  Upgraded.
l/opencv-4.8.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
n/bluez-5.67-x86_64-1.txz:  Upgraded.
n/openresolv-3.13.2-noarch-1.txz:  Upgraded.
n/p11-kit-0.25.0-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
  Make /etc/mtab a symlink to /proc/mounts. (I thought we did this before?)
  Remove /etc/mounts symlink.
  In rc.S, don't try to initialize /etc/mtab or fake mount /.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  Make /etc/mtab a symlink to /proc/mounts. (I thought we did this before?)
  Remove /etc/mounts symlink.
  In rc.S, don't try to initialize /etc/mtab or fake mount /.
---
 source/installer/ChangeLog.txt                | 5 +++++
 source/installer/sources/initrd/etc/mounts    | 1 -
 source/installer/sources/initrd/etc/mtab      | 1 +
 source/installer/sources/initrd/etc/rc.d/rc.S | 6 ------
 4 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 120000 source/installer/sources/initrd/etc/mounts
 create mode 120000 source/installer/sources/initrd/etc/mtab

(limited to 'source/installer')

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 9b48ad7fb..b6136575d 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,8 @@
+Fri Jun 30 19:34:16 UTC 2023
+  Make /etc/mtab a symlink to /proc/mounts. (I thought we did this before?)
+  Remove /etc/mounts symlink.
+  In rc.S, don't try to initialize /etc/mtab or fake mount /.
++--------------------------+
 Tue Jun 13 20:02:38 UTC 2023
   Added liburcu and liburcu-common libraries for xfsprogs.
 +--------------------------+
diff --git a/source/installer/sources/initrd/etc/mounts b/source/installer/sources/initrd/etc/mounts
deleted file mode 120000
index 4c0a0948b..000000000
--- a/source/installer/sources/initrd/etc/mounts
+++ /dev/null
@@ -1 +0,0 @@
-/proc/mounts
\ No newline at end of file
diff --git a/source/installer/sources/initrd/etc/mtab b/source/installer/sources/initrd/etc/mtab
new file mode 120000
index 000000000..4c0a0948b
--- /dev/null
+++ b/source/installer/sources/initrd/etc/mtab
@@ -0,0 +1 @@
+/proc/mounts
\ No newline at end of file
diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S
index 42a00ba74..133a7bf3b 100755
--- a/source/installer/sources/initrd/etc/rc.d/rc.S
+++ b/source/installer/sources/initrd/etc/rc.d/rc.S
@@ -1,12 +1,6 @@
 #!/bin/sh
 # rc.S: Basic system initialization.
 
-# Any /etc/mtab that exists here is old, so we start with a new one:
-/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab
-
-# Add (fake) entry for / to /etc/mtab:
-/sbin/mount -f -w /dev/initramfs / -t tmpfs 1> /dev/null
-
 # Mount /proc:
 /sbin/mount -v proc /proc -t proc 1> /dev/null
 
-- 
cgit v1.2.3-65-gdbad