From 40690e1f21f7d780f7202277f05e03967d3f4012 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 21 May 2012 01:47:41 +0000
Subject: [PATCH] Remove a bashism from the mountkernfs boot script.

Move the $time init capability from setclock to udev.

Remove and recreate $LFS/dev/shm in Section 6.2 if it is
a symbolic link.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9860 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 bootscripts/lfs/init.d/mountvirtfs |  2 +-
 bootscripts/lfs/init.d/setclock    |  2 +-
 bootscripts/lfs/init.d/udev        |  2 +-
 chapter01/changelog.xml            | 20 ++++++++++++++++++++
 chapter06/kernfs.xml               | 14 +++++++++++++-
 general.ent                        |  4 ++--
 packages.ent                       |  2 +-
 7 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs
index 6f9df8d14..0330a1a97 100644
--- a/bootscripts/lfs/init.d/mountvirtfs
+++ b/bootscripts/lfs/init.d/mountvirtfs
@@ -34,7 +34,7 @@ case "${1}" in
       # Make sure /run/var is available before logging any messages
       mkdir -p /run
       mount -n /run || failed=1
-      mkdir -p /run/{var,lock,shm}
+      mkdir -p /run/var /run/lock /run/shm
       chmod 1777 /run/shm
 
       log_info_msg "Mounting virtual file systems: ${INFO}/run" 
diff --git a/bootscripts/lfs/init.d/setclock b/bootscripts/lfs/init.d/setclock
index 00345c84e..8bf3f402d 100644
--- a/bootscripts/lfs/init.d/setclock
+++ b/bootscripts/lfs/init.d/setclock
@@ -13,7 +13,7 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            $time
+# Provides:            
 # Required-Start:
 # Should-Start:        modules
 # Required-Stop:
diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev
index 1246d6dad..5628545f6 100644
--- a/bootscripts/lfs/init.d/udev
+++ b/bootscripts/lfs/init.d/udev
@@ -13,7 +13,7 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            udev
+# Provides:            udev $time
 # Required-Start:
 # Should-Start:        modules
 # Required-Stop:
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5c1bc3ef5..5cb830581 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,26 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-05-20</para>
+      <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Remove a bashism from the mountkernfs boot script.
+           </para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Move the $time init capability from setclock
+           to udev. Fixes 
+           <ulink url="&lfs-ticket-root;3085">#3085</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Remove and recreate $LFS/dev/shm in Section 6.2
+           if it is a symbolic link. Fixes 
+           <ulink url="&lfs-ticket-root;3085">#3085</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-05-18</para>
       <itemizedlist>
diff --git a/chapter06/kernfs.xml b/chapter06/kernfs.xml
index bb06cfec8..50128b76a 100644
--- a/chapter06/kernfs.xml
+++ b/chapter06/kernfs.xml
@@ -69,10 +69,22 @@ mknod -m 666 $LFS/dev/null c 1 3</userinput></screen>
       <para>Now mount the remaining virtual kernel filesystems:</para>
 
 <screen><userinput>mount -vt devpts devpts $LFS/dev/pts
-mount -vt tmpfs shm $LFS/dev/shm
 mount -vt proc proc $LFS/proc
 mount -vt sysfs sysfs $LFS/sys</userinput></screen>
 
+      <para>In some host systems, <filename>/dev/shm</filename> is a 
+      symbolic link to <filename class="directory">/run/shm</filename>.
+      Inside a chroot envirnment, this symbolic link needs to be
+      changed to a normal directory before mounting as a temporary
+      file system:</para>
+
+<screen><userinput>if [ -h /dev/shm ]; then
+   rm -f $LFS/dev/shm
+   mkdir $LFS/dev/shm
+fi
+
+mount -vt tmpfs shm $LFS/dev/shm</userinput></screen>
+
   </sect2>
 
 </sect1>
diff --git a/general.ent b/general.ent
index 37faddf6b..2e6a4a863 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120518">
-<!ENTITY releasedate "May 18, 2012">
+<!ENTITY version "SVN-20120520">
+<!ENTITY releasedate "May 20, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index c24b70f9a..d1628a5a2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -302,7 +302,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20120505">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120520">                 <!-- 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 -->