diff options
| -rw-r--r-- | bootscripts/ChangeLog | 4 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/mountfs | 21 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/mountvirtfs | 8 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 2 |
6 files changed, 26 insertions, 23 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 3d7b4a5d2..c6569f092 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,7 @@ +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 before halting diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs index b700d8e7d..6784a6943 100644 --- a/bootscripts/lfs/init.d/mountfs +++ b/bootscripts/lfs/init.d/mountfs @@ -33,23 +33,12 @@ case "${1}" in 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 # their option list. _netdev denotes a network filesystem. @@ -60,13 +49,13 @@ case "${1}" in ;; 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 # This fails if swap or / are on an LVM partition diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs index 1c35fcd43..9c0d0f24d 100644 --- a/bootscripts/lfs/init.d/mountvirtfs +++ b/bootscripts/lfs/init.d/mountvirtfs @@ -33,7 +33,7 @@ case "${1}" in start) # 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 mkdir -p /run/var /run/lock /run/shm @@ -43,17 +43,17 @@ case "${1}" in 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 # Copy devices that Udev >= 155 doesn't handle to /dev diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0aa6eb44a..21a402d2e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,16 @@ </listitem> --> <listitem> + <para>2013-05-15</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Remove unnecessary options in bootscripts + due to mtab change.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2013-05-14</para> <itemizedlist> <listitem> diff --git a/general.ent b/general.ent index 3fb2ea84f..bb684442e 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20130514"> -<!ENTITY releasedate "May 14, 2013"> +<!ENTITY version "SVN-20130515"> +<!ENTITY releasedate "May 15, 2013"> <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.4"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index 3d087a0f7..0d964ee20 100644 --- a/packages.ent +++ b/packages.ent @@ -310,7 +310,7 @@ <!ENTITY less-ch6-du "3.6 MB"> <!ENTITY less-ch6-sbu "less than 0.1 SBU"> -<!ENTITY lfs-bootscripts-version "20130511"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20130515"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile --> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile --> |