Author: matthew Date: 2010-01-24 13:43:01 -0700 (Sun, 24 Jan 2010) New Revision: 9160
Modified: trunk/BOOK/bootscripts/ChangeLog trunk/BOOK/bootscripts/lfs/init.d/udev trunk/BOOK/chapter01/changelog.xml trunk/BOOK/packages.ent Log: Check that /dev isn't already mounted in the udev bootscript. Fixes #2550. Modified: trunk/BOOK/bootscripts/ChangeLog =================================================================== --- trunk/BOOK/bootscripts/ChangeLog 2010-01-24 20:19:18 UTC (rev 9159) +++ trunk/BOOK/bootscripts/ChangeLog 2010-01-24 20:43:01 UTC (rev 9160) @@ -1,3 +1,7 @@ +2010-01-24 Matthew Burgess <[email protected]> + * 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 <[email protected]> * lfs/init.d/udev_retry: Use "udevadm trigger --type=failed", which apparently replaced "--retry-failed" some time ago. "--retry-failed" is Modified: trunk/BOOK/bootscripts/lfs/init.d/udev =================================================================== --- trunk/BOOK/bootscripts/lfs/init.d/udev 2010-01-24 20:19:18 UTC (rev 9159) +++ trunk/BOOK/bootscripts/lfs/init.d/udev 2010-01-24 20:43:01 UTC (rev 9160) @@ -34,7 +34,9 @@ # 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} Modified: trunk/BOOK/chapter01/changelog.xml =================================================================== --- trunk/BOOK/chapter01/changelog.xml 2010-01-24 20:19:18 UTC (rev 9159) +++ trunk/BOOK/chapter01/changelog.xml 2010-01-24 20:43:01 UTC (rev 9160) @@ -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> Modified: trunk/BOOK/packages.ent =================================================================== --- trunk/BOOK/packages.ent 2010-01-24 20:19:18 UTC (rev 9159) +++ trunk/BOOK/packages.ent 2010-01-24 20:43:01 UTC (rev 9160) @@ -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 --> -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page
