diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f2cbe2277..883358cff 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,36 @@
-->
+
+ 2014-01-17
+
+
+ [krejzi] - Merge LFS SVN-20140114 book.
+
+
+
+
+
+ 2014-01-14
+
+
+ [bdubbs] - Update to inetutils-1.9.2 and remove
+ referece to old BLFS page. Fixes
+ #3471 and
+ #3473.
+
+
+ [bdubbs] - Fix hardcoded reference to /tools in
+ Chapter 6 glibc. Fixes
+ #3466.
+
+
+ [bdubbs] - Clean up /run and /tmp. Fixes
+ #3463.
+
+
+
+
2014-01-10
diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml
index c90285c9a..d946e5664 100644
--- a/chapter06/chroot.xml
+++ b/chapter06/chroot.xml
@@ -15,7 +15,7 @@
class="username">root, run the following command to enter the
realm that is, at the moment, populated with only the temporary tools:
-chroot "$LFS" /tools/bin/env -i \
+chroot "$LFS" /tools/bin/env -i \
HOME=/root \
TERM="$TERM" \
PS1='\u:\w\$ ' \
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 76f9b8b4d..a418f43a7 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -70,7 +70,8 @@ cd ../gcc-build
Prepare GCC for compilation:
-../gcc-&gcc-version;/configure --prefix=/usr \
+SED=sed \
+../gcc-&gcc-version;/configure --prefix=/usr \
--libexecdir=/usr/lib \
--enable-shared \
--enable-threads=posix \
@@ -87,15 +88,15 @@ cd ../gcc-build
The meaning of the new configure option:
-
+
--with-system-zlib
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 920abe64b..136b6383f 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -40,16 +40,16 @@
Installation of Inetutils
- Fix an incompatibility between this package and Glibc-&glibc-version;
+ Create a definition to allow the ifconfig program
+ to build properly.
-sed -i -e '/gets is a/d' lib/stdio.in.h
+echo '#define PATH_PROCNET_DEV "/proc/net/dev"' >> ifconfig/system/linux.h
Prepare Inetutils for compilation:
./configure --prefix=/usr \
--libexecdir=/usr/sbin \
--localstatedir=/var \
- --disable-ifconfig \
--disable-logger \
--disable-syslogd \
--disable-whois \
@@ -58,16 +58,6 @@
The meaning of the configure options:
-
- --disable-ifconfig
-
- This option prevents Inetutils from installing the
- ifconfig program, which can be used to configure network
- interfaces. LFS uses ip from IPRoute2 to perform
- this task.
-
-
-
--disable-logger
@@ -101,8 +91,7 @@
This disables the installation of the various network servers
included as part of the Inetutils package. These servers are deemed not
appropriate in a basic LFS system. Some are insecure by nature and are
- only considered safe on trusted networks. More information can be found
- at . Note that
+ only considered safe on trusted networks. Note that
better replacements are available for many of these servers.
@@ -120,14 +109,12 @@
Install the package:
make install
-
+
Move some programs so they are available if /usr is not accessible:
-mv -v /usr/bin/{hostname,ping,ping6,traceroute} /bin
+mv -v /usr/bin/{hostname,ping,ping6,traceroute} /bin
+mv -v /usr/bin/ifconfig /sbin
@@ -138,8 +125,8 @@ make -C doc install-html docdir=/usr/share/doc/inetutils-&inetutils-version;Installed programs
- ftp, hostname, ping, ping6, rcp, rexec, rlogin, rsh, talk, telnet,
- tftp, and traceroute
+ ftp, ifconfig, hostname, ping, ping6, rcp, rexec, rlogin,
+ rsh, talk, telnet, tftp, and traceroute
@@ -158,6 +145,16 @@ make -C doc install-html docdir=/usr/share/doc/inetutils-&inetutils-version;
+
+ ifconfig
+
+ Manages network interfaces
+
+ ifconfig
+
+
+
+
hostname
@@ -202,7 +199,7 @@ make -C doc install-html docdir=/usr/share/doc/inetutils-&inetutils-version;
rexec
- executes commands on a remote host
+ Executes commands on a remote host
rexec
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index ecfd51f71..6c4579a1e 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -10,12 +10,16 @@
Cleaning Up
+ Finally, clean up some extra files left around from running tests:
+
+rm -rf /run/* /tmp/*
+
From now on, when reentering the chroot environment after
exiting, use the following modified chroot command:
-chroot "$LFS" /usr/bin/env -i \
+chroot "$LFS" /usr/bin/env -i \
HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
- PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+ PATH=/bin:/usr/bin:/sbin:/usr/sbin \
/bin/bash --login
The reason for this is that the programs in ).
+rm -rf /tools
+
If the virtual kernel file systems have been unmounted, either manually
or through a reboot, ensure that the virtual kernel file systems are mounted
when reentering the chroot. This process was explained in
-
+
+
diff --git a/packages.ent b/packages.ent
index 362eda20a..a16d2d7f2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -310,10 +310,10 @@
-
-
+
+
-
+