Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f801081526ffe11177743ea9f324fd12bf3ab710)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f801081526ffe11177743ea9f324fd12bf3ab710)
  • Date: Tue, 18 Jul 2023 17:42:22 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

smgl/init.d/DETAILS | 1 +
smgl/init.d/HISTORY | 4 ++++
smgl/init.d/init.d/mountroot.sh | 9 ++++-----
3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit f801081526ffe11177743ea9f324fd12bf3ab710
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

init.d: mountroot.sh: Fix rootfs mounting, PATCHLEVEL++

mount -f is broken with linux-utils 2.39.1.

Fix the logic for modern systems; if mtab is missing just symlink it to
/proc/mounts.

diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index f09cf86..1789ec2 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,5 +1,6 @@
SPELL=init.d
VERSION=2.2.18
+ PATCHLEVEL=1
LICENSE[0]=GPL
GATHER_DOCS=off
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 10b16c8..aab9e7a 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,7 @@
+2023-07-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * init.d/mountroot.sh: fixed rootfs mounting with linux-utils 2.39.1
+
2019-04-22 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: use DEVICE-MANAGER

diff --git a/smgl/init.d/init.d/mountroot.sh b/smgl/init.d/init.d/mountroot.sh
index df78c5f..b99854d 100755
--- a/smgl/init.d/init.d/mountroot.sh
+++ b/smgl/init.d/init.d/mountroot.sh
@@ -77,11 +77,10 @@ start()

echo "Mounting root file system read/write..."
{
- mount -n -o remount,rw / &&
- if ! [[ -h /etc/mtab ]]; then
- builtin echo > /etc/mtab
- fi &&
- mount -f -o remount,rw /
+ mount -n -o remount,rw / &&
+ if ! [ -h /etc/mtab ]; then
+ ln -sf /proc/mounts /etc/mtab
+ fi
} || exit 1

evaluate_retval || exit 1



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f801081526ffe11177743ea9f324fd12bf3ab710), Ismael Luceno, 07/18/2023

Archive powered by MHonArc 2.6.24.

Top of Page