aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bootscripts/ChangeLog3
-rw-r--r--bootscripts/lfs/init.d/modules2
-rw-r--r--chapter01/changelog.xml18
-rw-r--r--chapter02/creatingpartition.xml6
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/db.xml4
-rw-r--r--chapter06/gcc.xml2
-rw-r--r--chapter06/iproute2.xml2
-rw-r--r--chapter06/shadow.xml2
-rw-r--r--chapter06/vim.xml4
-rw-r--r--chapter07/profile.xml2
-rw-r--r--chapter07/symlinks.xml2
-rw-r--r--chapter08/grub.xml2
-rw-r--r--chapter08/kernel.xml2
-rw-r--r--chapter09/reboot.xml20
-rw-r--r--general.ent4
-rw-r--r--packages.ent2
17 files changed, 50 insertions, 29 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index bff8db335..9d4fbbb2d 100644
--- a/bootscripts/ChangeLog
+++ b/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>
* Remove systemd references and files
diff --git a/bootscripts/lfs/init.d/modules b/bootscripts/lfs/init.d/modules
index 884768cf2..cab5cfadd 100644
--- a/bootscripts/lfs/init.d/modules
+++ b/bootscripts/lfs/init.d/modules
@@ -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
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 31115e8a6..cf44d86bc 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -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>
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index 9733b6fd4..0e86d7c2d 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -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>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index d10b804a5..e26144bdd 100644
--- a/chapter06/chapter06.xml
+++ b/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="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"/>
diff --git a/chapter06/db.xml b/chapter06/db.xml
index 5549c2ed4..e3c185362 100644
--- a/chapter06/db.xml
+++ b/chapter06/db.xml
@@ -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>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index b8b91f5de..e7efba79a 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -78,7 +78,7 @@ cd ../gcc-build</userinput></screen>
<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>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index d86037f33..5f4c98d66 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -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
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 19086094a..a44fd17a7 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -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>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 840440cac..edadde175 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -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 @@ done</userinput></screen>
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>
diff --git a/chapter07/profile.xml b/chapter07/profile.xml
index f2a8856c8..eb4abe3ea 100644
--- a/chapter07/profile.xml
+++ b/chapter07/profile.xml
@@ -157,6 +157,6 @@ EOF</userinput></screen>
<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>
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index 23e3026ef..0a7b5f3e1 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -255,7 +255,7 @@ MACAddress=cb:a9:87:65:43:21</screen>
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),
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 6d68f8605..424c5fc09 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -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;
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index d626b1288..336bdf9ad 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -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>
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index cbe1542db..ee5996ce6 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -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
diff --git a/general.ent b/general.ent
index 1661cd31a..43f148e31 100644
--- a/general.ent
+++ b/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 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}]" -->
diff --git a/packages.ent b/packages.ent
index dd4c65230..9a546b9ad 100644
--- a/packages.ent
+++ b/packages.ent
@@ -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 -->