Browse Source

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



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10671 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Bruce Dubbs 11 years ago
parent
commit
0bf4dfe63c

+ 3 - 0
bootscripts/ChangeLog

@@ -1,3 +1,6 @@
+2014-07-02 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Remove obsolete check for /proc/ksyms in modules boot script
+
 2014-06-29 Bruce Dubbs <bdubbs@linuxfromscratch.org>
 2014-06-29 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Remove systemd references and files
    * Remove systemd references and files
 
 

+ 1 - 1
bootscripts/lfs/init.d/modules

@@ -26,7 +26,7 @@
 ### END INIT INFO
 ### END INIT INFO
 
 
 # Assure that the kernel has module support.
 # 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
 . /lib/lsb/init-functions
 
 

+ 18 - 0
chapter01/changelog.xml

@@ -35,6 +35,24 @@
       </itemizedlist>
       </itemizedlist>
     </listitem>
     </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>
     <listitem>
       <para>2014-07-27</para>
       <para>2014-07-27</para>
       <itemizedlist>
       <itemizedlist>

+ 3 - 3
chapter02/creatingpartition.xml

@@ -59,10 +59,10 @@
 
 
   <note><para>For experienced users, other partitioning schemes are possible.
   <note><para>For experienced users, other partitioning schemes are possible.
   The new LFS system can be on a software <ulink
   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
   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
   an advanced topic.  These partitioning methodologies are not recommended for
   first time LFS users.</para></note>
   first time LFS users.</para></note>
 
 

+ 1 - 1
chapter06/chapter06.xml

@@ -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="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="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="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="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="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="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="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="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="libcap.xml"/>
 
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>

+ 2 - 2
chapter06/db.xml

@@ -42,7 +42,7 @@
       <para>There are instructions to build this package in the BLFS book if you
       <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
       need to build the RPC server or additional language bindings. The
       additional language bindings will require additional packages to be
       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>
       for suggested installation instructions.</para>
 
 
       <para>Also, GDBM <emphasis>could</emphasis> be used in place of Berkeley
       <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
       installed, not with GDBM. If you fully understand the risks versus
       benefits of using GDBM and wish to use it anyway, see the BLFS
       benefits of using GDBM and wish to use it anyway, see the BLFS
       instructions located at <ulink
       instructions located at <ulink
-      url="&blfs-root;view/svn/general/gdbm.html"/></para>
+      url="&blfs-root;view/&short-version;/general/gdbm.html"/></para>
 
 
     </tip>
     </tip>
 
 

+ 1 - 1
chapter06/gcc.xml

@@ -78,7 +78,7 @@ cd ../gcc-build</userinput></screen>
 
 
     <para>Note that for other languages, there are some prerequisites that
     <para>Note that for other languages, there are some prerequisites that
     are not yet available. See the
     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>
     for instructions on how to build all of GCC's supported languages.</para>
 
 
     <variablelist>
     <variablelist>

+ 1 - 1
chapter06/iproute2.xml

@@ -46,7 +46,7 @@
     common requirement on a base Linux system, remove the dependency on Berkeley
     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
     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
     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>
     </para>
 
 
 <screen><userinput remap="pre">sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
 <screen><userinput remap="pre">sed -i '/^TARGETS/s@arpd@@g' misc/Makefile

+ 1 - 1
chapter06/shadow.xml

@@ -43,7 +43,7 @@
 
 
     <note>
     <note>
       <para>If you would like to enforce the use of strong passwords, refer to
       <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
       CrackLib prior to building Shadow. Then add
       <parameter>--with-libcrack</parameter> to the <command>configure</command>
       <parameter>--with-libcrack</parameter> to the <command>configure</command>
       command below.</para>
       command below.</para>

+ 2 - 2
chapter06/vim.xml

@@ -34,7 +34,7 @@
 
 
       <para>If you prefer another editor&mdash;such as Emacs, Joe, or
       <para>If you prefer another editor&mdash;such as Emacs, Joe, or
       Nano&mdash;please refer to <ulink
       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>
       installation instructions.</para>
     </tip>
     </tip>
 
 
@@ -119,7 +119,7 @@ done</userinput></screen>
     additional libraries to be installed. For more information on this
     additional libraries to be installed. For more information on this
     process, refer to the Vim documentation and the Vim installation page
     process, refer to the Vim documentation and the Vim installation page
     in the BLFS book at <ulink
     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>
   </sect2>
 
 

+ 1 - 1
chapter07/profile.xml

@@ -157,6 +157,6 @@ EOF</userinput></screen>
 
 
   <para>UTF-8 based locales are not supported well by some programs.
   <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
   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>
 </sect1>

+ 1 - 1
chapter07/symlinks.xml

@@ -255,7 +255,7 @@ MACAddress=cb:a9:87:65:43:21</screen>
     fixable by creating Udev rules for custom persistent symlinks.
     fixable by creating Udev rules for custom persistent symlinks.
     The case of network cards is covered separately in
     The case of network cards is covered separately in
     <xref linkend="ch-scripts-network"/>, and sound card configuration can
     <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
     <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),
     (even if the problem doesn't exist in your current Linux distribution),

+ 1 - 1
chapter08/grub.xml

@@ -31,7 +31,7 @@
     already have a boot device, you can create one.  In order for the procedure
     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
     below to work, you need to jump ahead to BLFS and install
     <userinput>xorriso</userinput> from the <ulink
     <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>
     libisoburn</ulink> package.</para>
 
 
 <screen role="nodump"><userinput>cd /tmp &amp;&amp;
 <screen role="nodump"><userinput>cd /tmp &amp;&amp;

+ 1 - 1
chapter08/kernel.xml

@@ -61,7 +61,7 @@
     url="&hints-root;kernel-configuration.txt"/>.  BLFS has some information
     url="&hints-root;kernel-configuration.txt"/>.  BLFS has some information
     regarding particular kernel configuration requirements of packages outside
     regarding particular kernel configuration requirements of packages outside
     of LFS at <ulink
     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
     information about configuring and building the kernel can be found at
     <ulink url="http://www.kroah.com/lkn/"/> </para>
     <ulink url="http://www.kroah.com/lkn/"/> </para>
 
 

+ 10 - 10
chapter09/reboot.xml

@@ -21,42 +21,42 @@
   <itemizedlist>
   <itemizedlist>
 
 
     <listitem><para>A text mode browser such as <ulink
     <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
     will allow you to easily view the BLFS book in one virtual terminal, while
     building packages in another.</para></listitem>
     building packages in another.</para></listitem>
 
 
     <listitem><para>The <ulink
     <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
     you to perform copy/paste actions in your virtual
     terminals.</para></listitem>
     terminals.</para></listitem>
 
 
     <listitem><para>If you are in a situation where static IP configuration
     <listitem><para>If you are in a situation where static IP configuration
     does not meet your networking requirements, installing a package
     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
     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>
     useful.</para></listitem>
 
 
     <listitem><para>Installing <ulink
     <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
     building packages as a non-root user and easily installing the resulting
     packages in your new system.  </para></listitem>
     packages in your new system.  </para></listitem>
 
 
     <listitem><para>If you want to access your new system from a remote system
     <listitem><para>If you want to access your new system from a remote system
     within a comfortable GUI environment, install <ulink
     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
     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>
     </para></listitem>
 
 
     <listitem><para>To make fetching files over the internet easier, install
     <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>
     </para></listitem>
 
 
     <listitem><para>If one or more of your disk drives have a GUID partition
     <listitem><para>If one or more of your disk drives have a GUID partition
     table (GPT), either <ulink
     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>
     </para></listitem>
 
 
     <listitem><para>Finally, a review of the following configuration files
     <listitem><para>Finally, a review of the following configuration files

+ 2 - 2
general.ent

@@ -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 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 copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.6">
 <!ENTITY milestone       "7.6">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 1 - 1
packages.ent

@@ -370,7 +370,7 @@
 <!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 <!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-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->