aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2016-05-27 03:38:29 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2016-05-27 03:38:29 +0000
commitcbd8bf0ff339fce586b58ae892de89b30b078241 (patch)
tree82a7c9a5e22410e9e6a1310ab4c44a196278f731 /chapter06
parent35a5259fe64d197ee8202a38e58db4f3ea5383e9 (diff)
Updates after a successful jhalfs build
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11077 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/chapter06.xml11
-rw-r--r--chapter06/createfiles.xml2
2 files changed, 4 insertions, 9 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 300e8c57d..5ded6fe9f 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -39,7 +39,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.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="psmisc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
@@ -51,14 +50,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
@@ -66,12 +61,13 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
<!-- systemd only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
@@ -90,7 +86,6 @@
<!-- sysv only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 4c88468c3..5f2264628 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -154,7 +154,7 @@ messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
EOF</userinput></screen>
-<screen revision="systmed"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
+<screen revision="systemd"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
<literal>root:x:0:0:root:/root:/bin/bash
bin:x:1:1:bin:/dev/null:/bin/false
daemon:x:6:6:Daemon User:/dev/null:/bin/false