diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2010-01-24 20:43:01 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2010-01-24 20:43:01 +0000 |
| commit | f78845c7a84d665a0bf326335957c90d03faf78c (patch) | |
| tree | a508fa13080e5801ade1217eaa7f0df1a90a2ce6 | |
| parent | 0152a7b7b97f6aad29a550006474e171d4be78d1 (diff) | |
Check that /dev isn't already mounted in the udev bootscript. Fixes #2550.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9160 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | bootscripts/ChangeLog | 4 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/udev | 4 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 5 | ||||
| -rw-r--r-- | packages.ent | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 4b9d7cd50..2a2a334e5 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,7 @@ +2010-01-24 Matthew Burgess <matthew@linuxfromscratch.org> + * lfs/init.d/udev: Check to see if /dev is already mounted, as it may be if + under an initramfs environment. See ticket #2550. + 2009-08-14 Bryan Kadzban <bryan@linuxfromscratch.org> * lfs/init.d/udev_retry: Use "udevadm trigger --type=failed", which apparently replaced "--retry-failed" some time ago. "--retry-failed" is diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev index 03846e6f3..18965d514 100644 --- a/bootscripts/lfs/init.d/udev +++ b/bootscripts/lfs/init.d/udev @@ -34,7 +34,9 @@ case "${1}" in # made or removed during this boot don't affect the next one. # The reason we don't write to mtab is because we don't ever # want /dev to be unavailable (such as by `umount -a'). - mount -n -t tmpfs tmpfs /dev -o mode=755 + if ! mountpoint /dev > /dev/null; then + mount -n -t tmpfs tmpfs /dev -o mode=755 + fi if [ ${?} != 0 ]; then echo_failure boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE} diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 8ec7b430f..ac24ac30e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -41,6 +41,11 @@ <para>2010-01-24</para> <itemizedlist> <listitem> + <para>[matthew] Update to lfs-bootscripts-20100124, which checks that + /dev isn't already mounted. Fixes + <ulink url="&lfs-ticket-root;2550">#2550</ulink>.</para> + </listitem> + <listitem> <para>[matthew] Don't create /lib/udev/devices/kmsg as Udev >= 142 creates it automatically. Fixes <ulink url="&lfs-ticket-root;2552">#2552</ulink>.</para> diff --git a/packages.ent b/packages.ent index e7c530948..6905166fb 100644 --- a/packages.ent +++ b/packages.ent @@ -285,7 +285,7 @@ <!ENTITY less-ch6-du "2.9 MB"> <!ENTITY less-ch6-sbu "less than 0.1 SBU"> -<!ENTITY lfs-bootscripts-version "20090817"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20100124"> <!-- 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 --> |