Changeset 28c4c1e for bootscripts

Timestamp:

05/15/2013 05:01:37 PM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.4, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

4e7e16d

Parents:

85e7f3c

Message:

Remove unneeded options and commands from mountfs and
mountvirtfs when mtab is a symlink to /proc/self/mounts

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10275 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

bootscripts

Files:

• ChangeLog (modified) (1 diff)
• lfs/init.d/mountfs (modified) (2 diffs)
• lfs/init.d/mountvirtfs (modified) (2 diffs)

bootscripts/ChangeLog

@@ +1 @@
+2013-05-15 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Remove unneeded options and commands from mountfs and
+     mountvirtfs when mtab is a symlink to /proc/self/mounts
+
 2013-05-11 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Make sure the root fs is mounted read only in mountfs

bootscripts/lfs/init.d/mountfs

@@ -34 +34 @@
    start)
       log_info_msg "Remounting root file system in read-write mode..."
-      mount -n -o remount,rw / >/dev/null
+      mount -o remount,rw / >/dev/null
       evaluate_retval
 
       # Remove fsck-related file system watermarks.
       rm -f /fastboot /forcefsck
-
-      log_info_msg "Recording existing mounts in /etc/mtab..."
-      > /etc/mtab
-
-      mount -f /     || failed=1
-      mount -f /proc || failed=1
-      mount -f /sys  || failed=1
-      mount -f /run  || failed=1
-      mount -f /dev  || failed=1
-      (exit ${failed})
-      evaluate_retval
 
       # This will mount all filesystems that do not have _netdev in
@@ -61 +50 @@
 
    stop)
-      # Don't unmount tmpfs like /run
+      # Don't unmount virtual file systems like /run
       log_info_msg "Unmounting all other currently mounted file systems..."
-      umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs,noproc >/dev/null
+      umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs,noproc,nodevpts >/dev/null
       evaluate_retval
 
-      # Make sure / is mounted read only (umount bug?)
-      mount -n -o remount,ro /
+      # Make sure / is mounted read only (umount bug)
+      mount -o remount,ro /
 
       # Make all LVM volume groups unavailable, if appropriate

bootscripts/lfs/init.d/mountvirtfs

@@ -34 +34 @@
       # Make sure /run/var is available before logging any messages
       if ! mountpoint /run >/dev/null; then
-         mount -n /run || failed=1
+         mount /run || failed=1
       fi
 
@@ -44 +44 @@
       if ! mountpoint /proc >/dev/null; then
          log_info_msg2 " ${INFO}/proc"
-         mount -n -o nosuid,noexec,nodev /proc || failed=1
+         mount -o nosuid,noexec,nodev /proc || failed=1
       fi
 
       if ! mountpoint /sys >/dev/null; then
          log_info_msg2 " ${INFO}/sys" 
-         mount -n -o nosuid,noexec,nodev /sys || failed=1
+         mount -o nosuid,noexec,nodev /sys || failed=1
       fi
 
       if ! mountpoint /dev >/dev/null; then
          log_info_msg2 " ${INFO}/dev" 
-         mount -n -o mode=0755,nosuid /dev  || failed=1
+         mount -o mode=0755,nosuid /dev  || failed=1
       fi