Author: bdubbs
Date: Sat Aug  2 19:59:46 2014
New Revision: 10671

Log:
Move sed to be after acl. 
Remove reference to obsolete /proc/ksyms in modules boot script. 
Change internal references to svn to an entitiy.

Modified:
   trunk/BOOK/bootscripts/ChangeLog
   trunk/BOOK/bootscripts/lfs/init.d/modules
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter02/creatingpartition.xml
   trunk/BOOK/chapter06/chapter06.xml
   trunk/BOOK/chapter06/db.xml
   trunk/BOOK/chapter06/gcc.xml
   trunk/BOOK/chapter06/iproute2.xml
   trunk/BOOK/chapter06/shadow.xml
   trunk/BOOK/chapter06/vim.xml
   trunk/BOOK/chapter07/profile.xml
   trunk/BOOK/chapter07/symlinks.xml
   trunk/BOOK/chapter08/grub.xml
   trunk/BOOK/chapter08/kernel.xml
   trunk/BOOK/chapter09/reboot.xml
   trunk/BOOK/general.ent
   trunk/BOOK/packages.ent

Modified: trunk/BOOK/bootscripts/ChangeLog
==============================================================================
--- trunk/BOOK/bootscripts/ChangeLog    Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/bootscripts/ChangeLog    Sat Aug  2 19:59:46 2014        (r10671)
@@ -1,3 +1,6 @@
+2014-07-02 Bruce Dubbs <bdu...@linuxfromscratch.org>
+   * Remove obsolete check for /proc/ksyms in modules boot script
+
 2014-06-29 Bruce Dubbs <bdu...@linuxfromscratch.org>
    * Remove systemd references and files
 

Modified: trunk/BOOK/bootscripts/lfs/init.d/modules
==============================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/modules   Fri Aug  1 23:25:05 2014        
(r10670)
+++ trunk/BOOK/bootscripts/lfs/init.d/modules   Sat Aug  2 19:59:46 2014        
(r10671)
@@ -26,7 +26,7 @@
 ### END INIT INFO
 
 # Assure that the kernel has module support.
-[ -e /proc/ksyms -o -e /proc/modules ] || exit 0
+[ -e /proc/modules ] || exit 0
 
 . /lib/lsb/init-functions
 

Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml  Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter01/changelog.xml  Sat Aug  2 19:59:46 2014        (r10671)
@@ -36,6 +36,24 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-08-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Move sed to be after acl. Fixes
+          <ulink url="&lfs-ticket-root;3646">#3646</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Remove reference to obsolete /proc/ksyms in 
+          modules boot script.  Fixes
+          <ulink url="&lfs-ticket-root;3644">#3644</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Change internal references to svn to an 
entitiy.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-07-27</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/chapter02/creatingpartition.xml
==============================================================================
--- trunk/BOOK/chapter02/creatingpartition.xml  Fri Aug  1 23:25:05 2014        
(r10670)
+++ trunk/BOOK/chapter02/creatingpartition.xml  Sat Aug  2 19:59:46 2014        
(r10671)
@@ -59,10 +59,10 @@
 
   <note><para>For experienced users, other partitioning schemes are possible.
   The new LFS system can be on a software <ulink
-  url="&blfs-root;/view/svn/postlfs/raid.html">RAID</ulink> array or an <ulink
-  url="&blfs-root;/view/svn/postlfs/aboutlvm.html">LVM</ulink> logical volume.
+  url="&blfs-root;/view/&short-version;/postlfs/raid.html">RAID</ulink> array 
or an <ulink
+  url="&blfs-root;/view/&short-version;/postlfs/aboutlvm.html">LVM</ulink> 
logical volume.
   However, some of these options require an <ulink
-  url="&blfs-root;/view/svn/postlfs/initramfs.html">initramfs</ulink>, which is
+  
url="&blfs-root;/view/&short-version;/postlfs/initramfs.html">initramfs</ulink>,
 which is
   an advanced topic.  These partitioning methodologies are not recommended for
   first time LFS users.</para></note>
 

Modified: trunk/BOOK/chapter06/chapter06.xml
==============================================================================
--- trunk/BOOK/chapter06/chapter06.xml  Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter06/chapter06.xml  Sat Aug  2 19:59:46 2014        (r10671)
@@ -28,13 +28,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="mpc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="ncurses.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libcap.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="shadow.xml"/>

Modified: trunk/BOOK/chapter06/db.xml
==============================================================================
--- trunk/BOOK/chapter06/db.xml Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter06/db.xml Sat Aug  2 19:59:46 2014        (r10671)
@@ -42,7 +42,7 @@
       <para>There are instructions to build this package in the BLFS book if 
you
       need to build the RPC server or additional language bindings. The
       additional language bindings will require additional packages to be
-      installed. See <ulink 
url="&blfs-root;view/svn/server/databases.html#db"/>
+      installed. See <ulink 
url="&blfs-root;view/&short-version;/server/databases.html#db"/>
       for suggested installation instructions.</para>
 
       <para>Also, GDBM <emphasis>could</emphasis> be used in place of Berkeley
@@ -52,7 +52,7 @@
       installed, not with GDBM. If you fully understand the risks versus
       benefits of using GDBM and wish to use it anyway, see the BLFS
       instructions located at <ulink
-      url="&blfs-root;view/svn/general/gdbm.html"/></para>
+      url="&blfs-root;view/&short-version;/general/gdbm.html"/></para>
 
     </tip>
 

Modified: trunk/BOOK/chapter06/gcc.xml
==============================================================================
--- trunk/BOOK/chapter06/gcc.xml        Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter06/gcc.xml        Sat Aug  2 19:59:46 2014        (r10671)
@@ -78,7 +78,7 @@
 
     <para>Note that for other languages, there are some prerequisites that
     are not yet available. See the
-    <ulink url="&blfs-root;view/svn/general/gcc.html">BLFS Book</ulink>
+    <ulink url="&blfs-root;view/&short-version;/general/gcc.html">BLFS 
Book</ulink>
     for instructions on how to build all of GCC's supported languages.</para>
 
     <variablelist>

Modified: trunk/BOOK/chapter06/iproute2.xml
==============================================================================
--- trunk/BOOK/chapter06/iproute2.xml   Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter06/iproute2.xml   Sat Aug  2 19:59:46 2014        (r10671)
@@ -46,7 +46,7 @@
     common requirement on a base Linux system, remove the dependency on 
Berkeley
     DB by applying the commands below.  If the <command>arpd</command> binary 
is
     needed, instructions for compiling Berkeley DB can be found in the BLFS 
Book
-    at <ulink url="&blfs-root;view/svn/server/databases.html#db"/>.
+    at <ulink url="&blfs-root;view/&short-version;/server/databases.html#db"/>.
     </para>
 
 <screen><userinput remap="pre">sed -i '/^TARGETS/s@arpd@@g' misc/Makefile

Modified: trunk/BOOK/chapter06/shadow.xml
==============================================================================
--- trunk/BOOK/chapter06/shadow.xml     Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter06/shadow.xml     Sat Aug  2 19:59:46 2014        (r10671)
@@ -43,7 +43,7 @@
 
     <note>
       <para>If you would like to enforce the use of strong passwords, refer to
-      <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/> for installing
+      <ulink url="&blfs-root;view/&short-version;/postlfs/cracklib.html"/> for 
installing
       CrackLib prior to building Shadow. Then add
       <parameter>--with-libcrack</parameter> to the 
<command>configure</command>
       command below.</para>

Modified: trunk/BOOK/chapter06/vim.xml
==============================================================================
--- trunk/BOOK/chapter06/vim.xml        Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter06/vim.xml        Sat Aug  2 19:59:46 2014        (r10671)
@@ -34,7 +34,7 @@
 
       <para>If you prefer another editor&mdash;such as Emacs, Joe, or
       Nano&mdash;please refer to <ulink
-      url="&blfs-root;view/svn/postlfs/editors.html"/> for suggested
+      url="&blfs-root;view/&short-version;/postlfs/editors.html"/> for 
suggested
       installation instructions.</para>
     </tip>
 
@@ -119,7 +119,7 @@
     additional libraries to be installed. For more information on this
     process, refer to the Vim documentation and the Vim installation page
     in the BLFS book at <ulink
-    url="&blfs-root;view/svn/postlfs/vim.html"/>.</para>
+    url="&blfs-root;view/&short-version;/postlfs/vim.html"/>.</para>
 
   </sect2>
 

Modified: trunk/BOOK/chapter07/profile.xml
==============================================================================
--- trunk/BOOK/chapter07/profile.xml    Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter07/profile.xml    Sat Aug  2 19:59:46 2014        (r10671)
@@ -157,6 +157,6 @@
 
   <para>UTF-8 based locales are not supported well by some programs.
   Work is in progress to document and, if possible, fix such problems, see
-  <ulink url="&blfs-root;view/svn/introduction/locale-issues.html"/>.</para>
+  <ulink 
url="&blfs-root;view/&short-version;/introduction/locale-issues.html"/>.</para>
 
 </sect1>

Modified: trunk/BOOK/chapter07/symlinks.xml
==============================================================================
--- trunk/BOOK/chapter07/symlinks.xml   Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter07/symlinks.xml   Sat Aug  2 19:59:46 2014        (r10671)
@@ -255,7 +255,7 @@
     fixable by creating Udev rules for custom persistent symlinks.
     The case of network cards is covered separately in
     <xref linkend="ch-scripts-network"/>, and sound card configuration can
-    be found in <ulink 
url="&blfs-root;view/svn/postlfs/devices.html">BLFS</ulink>.</para>
+    be found in <ulink 
url="&blfs-root;view/&short-version;/postlfs/devices.html">BLFS</ulink>.</para>
 
     <para>For each of your devices that is likely to have this problem
     (even if the problem doesn't exist in your current Linux distribution),

Modified: trunk/BOOK/chapter08/grub.xml
==============================================================================
--- trunk/BOOK/chapter08/grub.xml       Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter08/grub.xml       Sat Aug  2 19:59:46 2014        (r10671)
@@ -31,7 +31,7 @@
     already have a boot device, you can create one.  In order for the procedure
     below to work, you need to jump ahead to BLFS and install
     <userinput>xorriso</userinput> from the <ulink
-    
url="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libisoburn.html";>
+    
url="http://www.linuxfromscratch.org/blfs/view/&short-version;/multimedia/libisoburn.html";>
     libisoburn</ulink> package.</para>
 
 <screen role="nodump"><userinput>cd /tmp &amp;&amp;

Modified: trunk/BOOK/chapter08/kernel.xml
==============================================================================
--- trunk/BOOK/chapter08/kernel.xml     Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter08/kernel.xml     Sat Aug  2 19:59:46 2014        (r10671)
@@ -61,7 +61,7 @@
     url="&hints-root;kernel-configuration.txt"/>.  BLFS has some information
     regarding particular kernel configuration requirements of packages outside
     of LFS at <ulink
-    url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>.  Additional
+    
url="&blfs-root;view/&short-version;/longindex.html#kernel-config-index"/>.  
Additional
     information about configuring and building the kernel can be found at
     <ulink url="http://www.kroah.com/lkn/"/> </para>
 

Modified: trunk/BOOK/chapter09/reboot.xml
==============================================================================
--- trunk/BOOK/chapter09/reboot.xml     Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/chapter09/reboot.xml     Sat Aug  2 19:59:46 2014        (r10671)
@@ -21,42 +21,42 @@
   <itemizedlist>
 
     <listitem><para>A text mode browser such as <ulink
-    url='&blfs-root;/view/svn/basicnet/lynx.html'>Lynx</ulink>
+    url='&blfs-root;/view/&short-version;/basicnet/lynx.html'>Lynx</ulink>
     will allow you to easily view the BLFS book in one virtual terminal, while
     building packages in another.</para></listitem>
 
     <listitem><para>The <ulink
-    url='&blfs-root;/view/svn/general/gpm.html'>GPM</ulink> package will allow
+    url='&blfs-root;/view/&short-version;/general/gpm.html'>GPM</ulink> 
package will allow
     you to perform copy/paste actions in your virtual
     terminals.</para></listitem>
 
     <listitem><para>If you are in a situation where static IP configuration
     does not meet your networking requirements, installing a package
-    such as <ulink 
url='&blfs-root;/view/svn/basicnet/dhcpcd.html'>dhcpcd</ulink>
+    such as <ulink 
url='&blfs-root;/view/&short-version;/basicnet/dhcpcd.html'>dhcpcd</ulink>
     or the client portion of <ulink
-    url='&blfs-root;/view/svn/basicnet/dhcp.html'>dhcp</ulink> may be
+    url='&blfs-root;/view/&short-version;/basicnet/dhcp.html'>dhcp</ulink> may 
be
     useful.</para></listitem>
 
     <listitem><para>Installing <ulink
-    url='&blfs-root;/view/svn/postlfs/sudo.html'>sudo</ulink> may be useful for
+    url='&blfs-root;/view/&short-version;/postlfs/sudo.html'>sudo</ulink> may 
be useful for
     building packages as a non-root user and easily installing the resulting
     packages in your new system.  </para></listitem>
 
     <listitem><para>If you want to access your new system from a remote system
     within a comfortable GUI environment, install <ulink
-    url='&blfs-root;/view/svn/postlfs/openssh.html'>openssh</ulink> and its
+    
url='&blfs-root;/view/&short-version;/postlfs/openssh.html'>openssh</ulink> and 
its
     prerequsite, <ulink
-    url='&blfs-root;/view/svn/postlfs/openssl.html'>openssl</ulink>.
+    
url='&blfs-root;/view/&short-version;/postlfs/openssl.html'>openssl</ulink>.
     </para></listitem>
 
     <listitem><para>To make fetching files over the internet easier, install
-    <ulink url='&blfs-root;/view/svn/basicnet/wget.html'>wget</ulink>.
+    <ulink 
url='&blfs-root;/view/&short-version;/basicnet/wget.html'>wget</ulink>.
     </para></listitem>
 
     <listitem><para>If one or more of your disk drives have a GUID partition
     table (GPT), either <ulink
-    url='&blfs-root;/view/svn/postlfs/gptfdisk.html'>gptfdisk</ulink> or <ulink
-    url='&blfs-root;/view/svn/postlfs/parted.html'>parted</ulink> will be 
useful.
+    
url='&blfs-root;/view/&short-version;/postlfs/gptfdisk.html'>gptfdisk</ulink> 
or <ulink
+    url='&blfs-root;/view/&short-version;/postlfs/parted.html'>parted</ulink> 
will be useful.
     </para></listitem>
 
     <listitem><para>Finally, a review of the following configuration files

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/general.ent      Sat Aug  2 19:59:46 2014        (r10671)
@@ -1,6 +1,6 @@
-<!ENTITY version         "SVN-20140801">
+<!ENTITY version         "SVN-20140802">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for 
release -->
-<!ENTITY releasedate     "August 01, 2014">
+<!ENTITY releasedate     "August 02, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not 
&ndash; -->
 <!ENTITY milestone       "7.6">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or 
"x.y[-pre{x}]" -->

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Fri Aug  1 23:25:05 2014        (r10670)
+++ trunk/BOOK/packages.ent     Sat Aug  2 19:59:46 2014        (r10671)
@@ -370,7 +370,7 @@
 <!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20140629">              <!-- Scripts depend 
on this format -->
+<!ENTITY lfs-bootscripts-version "20140802">              <!-- 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://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to