aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile237
-rw-r--r--appendices/acknowledgments.xml2
-rw-r--r--appendices/scripts.xml2
-rw-r--r--appendices/udev-rules.xml2
-rw-r--r--chapter06/chapter06.xml17
-rw-r--r--chapter06/chapter06d.xml87
-rw-r--r--chapter06/dbus.xml2
-rw-r--r--chapter06/eudev.xml4
-rw-r--r--chapter06/sysklogd.xml2
-rw-r--r--chapter06/systemd.xml2
-rw-r--r--chapter06/sysvinit.xml2
-rw-r--r--chapter07/bootscripts.xml2
-rw-r--r--chapter07/chapter07.xml21
-rw-r--r--chapter07/chapter07d.xml25
-rw-r--r--chapter07/clock.xml2
-rw-r--r--chapter07/consoled.xml2
-rw-r--r--chapter07/introduction.xml2
-rw-r--r--chapter07/introductiond.xml2
-rw-r--r--chapter07/locale.xml2
-rw-r--r--chapter07/network.xml2
-rw-r--r--chapter07/networkd.xml2
-rw-r--r--chapter07/profile.xml2
-rw-r--r--chapter07/symlinks.xml2
-rw-r--r--chapter07/symlinksd.xml2
-rw-r--r--chapter07/systemd-custom.xml2
-rw-r--r--chapter07/udev.xml2
-rw-r--r--chapter07/udevd.xml2
-rw-r--r--chapter07/usage.xml2
-rw-r--r--index.xml3
-rw-r--r--indexd.xml48
30 files changed, 106 insertions, 380 deletions
diff --git a/Makefile b/Makefile
index e024d1cb1..9ac5a675f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,9 @@
-BASEDIR = ~/lfs-book
-SYSDDIR = ~/lfs-systemd
-DUMPDIR = ~/lfs-commands
+#BASEDIR = ~/lfs-book
+#SYSDDIR = ~/lfs-systemd
+#DUMPDIR = ~/lfs-commands
RENDERTMP = $(HOME)/tmp
CHUNK_QUIET = 1
ROOT_ID =
-PDF_OUTPUT = LFS-BOOK.pdf
-PDF_SYSD_OUTPUT = LFS-SYSD-BOOK.pdf
-NOCHUNKS_OUTPUT = LFS-BOOK.html
-NOCHUNKS_SYSD_FILE = LFS-SYSD-BOOK.html
SHELL = /bin/bash
ifdef V
@@ -16,14 +12,30 @@ else
Q = @
endif
-sysv: validate profile-html
- $(Q)xsltproc --nonet \
- --output $(RENDERTMP)/lfs-html2.xml \
- --stringparam profile.revision sysv \
- stylesheets/lfs-xsl/profile.xsl \
- $(RENDERTMP)/lfs-html.xml
+ifndef REV
+ REV = sysv
+endif
+
+ifneq ($(REV), sysv)
+ ifneq ($(REV), systemd)
+ $(error REV must be 'sysv' (default) or 'systemd'.)
+ endif
+endif
+
+ifeq ($(REV), sysv)
+ BASEDIR = ~/lfs-book
+ PDF_OUTPUT = LFS-BOOK.pdf
+ NOCHUNKS_OUTPUT = LFS-BOOK.html
+ DUMPDIR = ~/lfs-commands
+else
+ BASEDIR = ~/lfs-systemd
+ PDF_OUTPUT = LFS-SYSD-BOOK.pdf
+ NOCHUNKS_OUTPUT = LFS-SYSD-BOOK.html
+ DUMPDIR = ~/lfs-sysd-commands
+endif
- @echo "Generating chunked XHTML files..."
+book: validate profile-html
+ @echo "Generating chunked XHTML files at $(BASEDIR)/ ..."
$(Q)xsltproc --nonet \
--stringparam chunk.quietly $(CHUNK_QUIET) \
--stringparam rootid "$(ROOT_ID)" \
@@ -53,48 +65,13 @@ sysv: validate profile-html
$(Q)$(MAKE) --no-print-directory wget-list md5sums
-systemd: validated profile-html
- $(Q)xsltproc --nonet \
- --output $(RENDERTMP)/lfs-html2.xml \
- --stringparam profile.revision systemd \
- stylesheets/lfs-xsl/profile.xsl \
- $(RENDERTMP)/lfs-html.xml
-
- @echo "Generating chunked XHTML files..."
- $(Q)xsltproc --nonet \
- --stringparam chunk.quietly $(CHUNK_QUIET) \
- --stringparam rootid "$(ROOT_ID)" \
- --stringparam base.dir $(SYSDDIR)/ \
- stylesheets/lfs-chunked.xsl \
- $(RENDERTMP)/lfs-html2.xml
-
- @echo "Copying CSS code and images..."
- $(Q)mkdir -p $(SYSDDIR)/stylesheets
- $(Q)cp stylesheets/lfs-xsl/*.css $(SYSDDIR)/stylesheets
-
- $(Q)mkdir -p $(SYSDDIR)/images
- $(Q)cp images/*.png $(SYSDDIR)/images
-
- @echo "Running Tidy and obfuscate.sh..."
- $(Q)for filename in `find $(SYSDDIR) -name "*.html"`; do \
- tidy -config tidy.conf $$filename; \
- true; \
- /bin/bash obfuscate.sh $$filename; \
- sed -e "s@text/html@application/xhtml+xml@g" \
- -e "s/\xa9/\©/ " \
- -i $$filename; \
- done;
-
- $(Q)$(MAKE) --no-print-directory wget-listd md5sumsd
-
pdf: validate
@echo "Generating profiled XML for PDF..."
$(Q)xsltproc --nonet \
--stringparam profile.condition pdf \
- --stringparam profile.revision sysv \
--output $(RENDERTMP)/lfs-pdf.xml \
stylesheets/lfs-xsl/profile.xsl \
- $(RENDERTMP)/lfs-full.xml
+ $(RENDERTMP)/lfs-html2.xml
@echo "Generating FO file..."
$(Q)xsltproc --nonet \
@@ -113,39 +90,7 @@ pdf: validate
@echo "$(BASEDIR)/$(PDF_OUTPUT) created"
@echo "fop.log created"
-pdfd: validated
- @echo "Generating profiled XML for PDF..."
- $(Q)xsltproc --nonet \
- --stringparam profile.condition pdf \
- --stringparam profile.revision systemd \
- --output $(RENDERTMP)/lfs-pdf.xml \
- stylesheets/lfs-xsl/profile.xsl \
- $(RENDERTMP)/lfs-full.xml
-
- @echo "Generating FO file..."
- $(Q)xsltproc --nonet \
- --stringparam rootid "$(ROOT_ID)" \
- --output $(RENDERTMP)/lfs-pdf.fo \
- stylesheets/lfs-pdf.xsl \
- $(RENDERTMP)/lfs-pdf.xml
-
- $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/lfs-pdf.fo
- $(Q)bash pdf-fixups.sh $(RENDERTMP)/lfs-pdf.fo
-
- @echo "Generating PDF file..."
- $(Q)mkdir -p $(SYSDDIR)
-
- $(Q)fop -q $(RENDERTMP)/lfs-pdf.fo $(SYSDDIR)/$(PDF_SYSD_OUTPUT) 2>fop.log
- @echo "$(SYSDDIR)/$(PDF_SYSD_OUTPUT) created"
- @echo "fop.log created"
-
nochunks: validate profile-html
- $(Q)xsltproc --nonet \
- --output $(RENDERTMP)/lfs-html2.xml \
- --stringparam profile.revision sysv \
- stylesheets/lfs-xsl/profile.xsl \
- $(RENDERTMP)/lfs-html.xml
-
@echo "Generating non chunked XHTML file..."
$(Q)xsltproc --nonet \
--stringparam rootid "$(ROOT_ID)" \
@@ -165,81 +110,55 @@ nochunks: validate profile-html
@echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"
-nochunksd: validated profile-html
- $(Q)xsltproc --nonet \
- --output $(RENDERTMP)/lfs-html2.xml \
- --stringparam profile.revision systemd \
- stylesheets/lfs-xsl/profile.xsl \
- $(RENDERTMP)/lfs-html.xml
-
- @echo "Generating non chunked XHTML file..."
- $(Q)xsltproc --nonet \
- --stringparam rootid "$(ROOT_ID)" \
- --output $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) \
- stylesheets/lfs-nochunks.xsl \
- $(RENDERTMP)/lfs-html2.xml
-
- @echo "Running Tidy..."
- $(Q)tidy -config tidy.conf $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) || true
-
- @echo "Running obfuscate.sh..."
- $(Q)bash obfuscate.sh $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
- $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
- $(Q)sed -i -e "s@../wget-list@wget-list@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
- $(Q)sed -i -e "s@../md5sums@md5sums@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
- $(Q)sed -i -e "s@\xa9@\©@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
-
- @echo "Output at $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)"
-
tmpdir:
@echo "Creating and cleaning $(RENDERTMP)"
$(Q)mkdir -p $(RENDERTMP)
$(Q)rm -f $(RENDERTMP)/lfs*.xml
- $(Q)rm -f $(RENDERTMP)/sysd*.xml
+ $(Q)rm -f $(RENDERTMP)/*wget*
+ $(Q)rm -f $(RENDERTMP)/*md5sum*
$(Q)rm -f $(RENDERTMP)/*pdf.fo
validate: tmpdir
@echo "Processing bootscripts..."
$(Q)bash process-scripts.sh
+
+ @echo "Adjusting for revision $(REV)..."
+ $(Q)xsltproc --nonet \
+ --xinclude \
+ --output $(RENDERTMP)/lfs-html2.xml \
+ --stringparam profile.revision $(REV) \
+ stylesheets/lfs-xsl/profile.xsl \
+ index.xml
+
@echo "Validating the book..."
$(Q)xmllint --nonet \
--noent \
- --xinclude \
--postvalid \
-o $(RENDERTMP)/lfs-full.xml \
- index.xml
+ $(RENDERTMP)/lfs-html2.xml
+
$(Q)rm -f appendices/*.script
$(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
@echo "Validation complete."
-validated: tmpdir
- @echo "Validating the book..."
- $(Q)xmllint --nonet \
- --noent \
- --xinclude \
- --postvalid \
- -o $(RENDERTMP)/lfs-full.xml \
- indexd.xml
- @echo "Validation complete."
-
profile-html:
@echo "Generating profiled XML for XHTML..."
$(Q)xsltproc --nonet \
--stringparam profile.condition html \
--output $(RENDERTMP)/lfs-html.xml \
stylesheets/lfs-xsl/profile.xsl \
- $(RENDERTMP)/lfs-full.xml
+ $(RENDERTMP)/lfs-html2.xml
wget-list: $(BASEDIR)/wget-list
$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
packages.ent patches.ent
- @echo "Generating wget list for sysv..."
+ @echo "Generating wget list for sysv at $(BASEDIR)/wget-list ..."
$(Q)mkdir -p $(BASEDIR)
- $(Q)xsltproc --nonet --xinclude \
- --stringparam profile.revision sysv \
- --output $(RENDERTMP)/sysd-wget.xml \
- stylesheets/lfs-xsl/profile.xsl \
+ $(Q)xsltproc --nonet --xinclude \
+ --stringparam profile.revision $(REV) \
+ --output $(RENDERTMP)/sysd-wget.xml \
+ stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \
@@ -247,31 +166,14 @@ $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
stylesheets/wget-list.xsl \
chapter03/chapter03.xml
-wget-listd: $(SYSDDIR)/wget-listd
-$(SYSDDIR)/wget-listd: stylesheets/wget-list.xsl chapter03/chapter03.xml \
- packages.ent patches.ent
- @echo "Generating wget list for systemd..."
- $(Q)mkdir -p $(SYSDDIR)
-
- $(Q)xsltproc --xinclude --nonet \
- --stringparam profile.revision systemd \
- --output $(RENDERTMP)/sysd-wget.xml \
- stylesheets/lfs-xsl/profile.xsl \
- chapter03/chapter03.xml
-
- $(Q)xsltproc --xinclude --nonet \
- --output $(SYSDDIR)/wget-list \
- stylesheets/wget-list.xsl \
- $(RENDERTMP)/sysd-wget.xml
-
md5sums: $(BASEDIR)/md5sums
$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
packages.ent patches.ent
- @echo "Generating md5sum file for sysv..."
+ @echo "Generating md5sum file for sysv at $(BASEDIR)/md5sums ..."
$(Q)mkdir -p $(BASEDIR)
$(Q)xsltproc --nonet --xinclude \
- --stringparam profile.revision sysv \
+ --stringparam profile.revision $(REV) \
--output $(RENDERTMP)/sysv-md5sum.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
@@ -284,28 +186,12 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
"s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
$(BASEDIR)/md5sums
-md5sumsd: $(SYSDDIR)/md5sums
-$(SYSDDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
- packages.ent patches.ent
- @echo "Generating md5sum file for systemd..."
- $(Q)mkdir -p $(SYSDDIR)
- $(Q)xsltproc --nonet --xinclude \
- --stringparam profile.revision systemd \
- --output $(RENDERTMP)/sysd-md5sum.xml \
- stylesheets/lfs-xsl/profile.xsl \
- chapter03/chapter03.xml
-
- $(Q)xsltproc --xinclude --nonet \
- --output $(SYSDDIR)/md5sums \
- stylesheets/md5sum.xsl \
- $(RENDERTMP)/sysd-md5sum.xml
-
dump-commands: validate
@echo "Dumping book commands..."
- $(Q)xsltproc --nonet \
- --output $(RENDERTMP)/lfs-html.xml \
- --stringparam profile.revision sysv \
- stylesheets/lfs-xsl/profile.xsl \
+ $(Q)xsltproc --nonet \
+ --output $(RENDERTMP)/lfs-html.xml \
+ --stringparam profile.revision $(REV) \
+ stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-full.xml
$(Q)rm -rf $(DUMPDIR)
@@ -315,22 +201,7 @@ dump-commands: validate
$(RENDERTMP)/lfs-html.xml
@echo "Dumping book commands complete in $(DUMPDIR)"
-dump-commandsd: validated
- @echo "Dumping book commands..."
- $(Q)xsltproc --nonet \
- --output $(RENDERTMP)/lfs-html.xml \
- --stringparam profile.revision systemd \
- stylesheets/lfs-xsl/profile.xsl \
- $(RENDERTMP)/lfs-full.xml
-
- $(Q)rm -rf $(DUMPDIR)
-
- $(Q)xsltproc --output $(DUMPDIR)/ \
- stylesheets/dump-commands.xsl \
- $(RENDERTMP)/lfs-html.xml
- @echo "Dumping book commands complete in $(DUMPDIR)"
-
-all: lfs nochunks pdf dump-commands
+all: book nochunks pdf dump-commands
-.PHONY : all sysv systemd dump-commands lfs nochunks pdf profile-html tmpdir validate
+.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list
diff --git a/appendices/acknowledgments.xml b/appendices/acknowledgments.xml
index 340951148..5ebcbfa95 100644
--- a/appendices/acknowledgments.xml
+++ b/appendices/acknowledgments.xml
@@ -214,7 +214,7 @@
</listitem>
<listitem>
- <para><ulink url="mailto:baque@cict.fr">Philippe Baqu&eacute;</ulink>
+ <para><ulink url="mailto:baque@cict.fr">Philippe Baque</ulink>
&lt;baque@cict.fr&gt; &ndash; lfs.cict.fr mirror</para>
</listitem>
diff --git a/appendices/scripts.xml b/appendices/scripts.xml
index abe836cb7..69d653bdc 100644
--- a/appendices/scripts.xml
+++ b/appendices/scripts.xml
@@ -32,7 +32,7 @@
%general-entities;
]>
-<appendix id="scripts" xreflabel="Appendix D">
+<appendix id="scripts" xreflabel="Appendix D" revision="sysv">
<?dbhtml dir="scripts"?>
<?dbhtml filename="scripts.html"?>
diff --git a/appendices/udev-rules.xml b/appendices/udev-rules.xml
index cdc968776..d1ab70dcf 100644
--- a/appendices/udev-rules.xml
+++ b/appendices/udev-rules.xml
@@ -6,7 +6,7 @@
%general-entities;
]>
-<appendix id="rules" xreflabel="Appendix E">
+<appendix id="rules" xreflabel="Appendix E" revision="sysv">
<?dbhtml dir="scripts"?>
<?dbhtml filename="eudev-rules.html"?>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 264834493..300e8c57d 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -67,10 +67,11 @@
<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"/>
+ <!-- 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="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"/>
@@ -82,16 +83,20 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
+ <!-- systemd only -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+
+ <!-- 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"/>
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>-->
+ <!-- sysv only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
diff --git a/chapter06/chapter06d.xml b/chapter06/chapter06d.xml
deleted file mode 100644
index d08135f7e..000000000
--- a/chapter06/chapter06d.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../general.ent">
- %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Chapter 6">
- <?dbhtml dir="chapter06"?>
- <?dbhtml filename="chapter06.html"?>
-
- <title>Installing Basic System Software</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kernfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-headers.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-pages.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="adjusting.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.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="gcc.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="libcap.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="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="iana-etc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
- <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="gperf.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="intltool.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="xz.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.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="systemd.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="coreutils.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
- <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="groff.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.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"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/>
-
-</chapter>
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index ee5390137..0448659f6 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-system-dbus" role="wrap">
+<sect1 id="ch-system-dbus" role="wrap" revision="systemd">
<?dbhtml filename="dbus.html"?>
<sect1info condition="script">
diff --git a/chapter06/eudev.xml b/chapter06/eudev.xml
index 498ec8c30..2930b8e02 100644
--- a/chapter06/eudev.xml
+++ b/chapter06/eudev.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-system-eudev" role="wrap">
+<sect1 id="ch-system-eudev" role="wrap" revision="sysv">
<?dbhtml filename="eudev.html"?>
<sect1info condition="script">
@@ -152,7 +152,7 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
<bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="udevadm">
+ <varlistentry id="udevadm" revision="sysv">
<term><command>udevadm</command></term>
<listitem>
<para>Generic udev administration tool: controls the udevd daemon,
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index db76b6c85..d4cf68ecb 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-system-sysklogd" role="wrap">
+<sect1 id="ch-system-sysklogd" role="wrap" revision="sysv">
<?dbhtml filename="sysklogd.html"?>
<sect1info condition="script">
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index bbfac9c61..76ed51378 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-system-systemd" role="wrap">
+<sect1 id="ch-system-systemd" role="wrap" revision="systemd">
<?dbhtml filename="systemd.html"?>
<sect1info condition="script">
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 33376f7c2..7ef8bc4e6 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-system-sysvinit" role="wrap">
+<sect1 id="ch-system-sysvinit" role="wrap" revision="sysv">
<?dbhtml filename="sysvinit.html"?>
<sect1info condition="script">
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 76bde3d03..8c4c1695e 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-bootscripts" role="wrap">
+<sect1 id="ch-scripts-bootscripts" role="wrap" revision="sysv">
<?dbhtml filename="bootscripts.html"?>
<sect1info condition="script">
diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml
index e1abbc637..e3cdcd721 100644
--- a/chapter07/chapter07.xml
+++ b/chapter07/chapter07.xml
@@ -16,16 +16,23 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinks.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hosts.xml"/>-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usage.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysd-custom.xml"/> -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hostname.xml"/>-->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="setclock.xml"/>-->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="console.xml"/>-->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>-->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="site.xml"/>-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
+
+ <!-- systemd -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introductiond.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udevd.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinksd.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clock.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consoled.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
+
+ <!-- common -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
+ <!-- systemd -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-custom.xml"/>
+
</chapter>
diff --git a/chapter07/chapter07d.xml b/chapter07/chapter07d.xml
deleted file mode 100644
index a2c30abe0..000000000
--- a/chapter07/chapter07d.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../general.ent">
- %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Chapter 7">
- <?dbhtml dir="chapter07"?>
- <?dbhtml filename="chapter07.html"?>
-
- <title>Basic System Configuration</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introductiond.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udevd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinksd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clock.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consoled.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshellsd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-custom.xml"/>
-
-</chapter>
diff --git a/chapter07/clock.xml b/chapter07/clock.xml
index 0dbdc7eaf..f5e710ebe 100644
--- a/chapter07/clock.xml
+++ b/chapter07/clock.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-clock">
+<sect1 id="ch-scripts-clock" revision="systemd">
<?dbhtml filename="clock.html"?>
<title>Configuring the system clock</title>
diff --git a/chapter07/consoled.xml b/chapter07/consoled.xml
index ea1062c23..f9d2ea0d5 100644
--- a/chapter07/consoled.xml
+++ b/chapter07/consoled.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-console">
+<sect1 id="ch-scripts-console" revision="systemd">
<?dbhtml filename="console.html"?>
<title>Configuring the Linux Console</title>
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index 8ee7384cd..810c927cc 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-introduction">
+<sect1 id="ch-scripts-introduction" revision="sysv">
<?dbhtml filename="introduction.html"?>
<title>Introduction</title>
diff --git a/chapter07/introductiond.xml b/chapter07/introductiond.xml
index 59d618b8b..dbd6705ce 100644
--- a/chapter07/introductiond.xml
+++ b/chapter07/introductiond.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-introduction">
+<sect1 id="ch-scripts-introduction" revision="systemd">
<?dbhtml filename="introduction.html"?>
<title>Introduction</title>
diff --git a/chapter07/locale.xml b/chapter07/locale.xml
index 76dbb7251..3e6c2aa7a 100644
--- a/chapter07/locale.xml
+++ b/chapter07/locale.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-locale">
+<sect1 id="ch-scripts-locale" revision="systemd">
<?dbhtml filename="locale.html"?>
<title>Configuring the System Locale</title>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index f70f23c41..f95f0e26d 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-network">
+<sect1 id="ch-scripts-network" revision="sysv">
<?dbhtml filename="network.html"?>
<title>General Network Configuration</title>
diff --git a/chapter07/networkd.xml b/chapter07/networkd.xml
index 86dcb3e53..17e879fb7 100644
--- a/chapter07/networkd.xml
+++ b/chapter07/networkd.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-network">
+<sect1 id="ch-scripts-network" revision="systemd">
<?dbhtml filename="network.html"?>
<title>General Network Configuration</title>
diff --git a/chapter07/profile.xml b/chapter07/profile.xml
index a3b066fd0..8bbcb8eae 100644
--- a/chapter07/profile.xml
+++ b/chapter07/profile.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-profile">
+<sect1 id="ch-scripts-profile" revision="sysv">
<?dbhtml filename="profile.html"?>
<title>The Bash Shell Startup Files</title>
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index 0993f2305..e80f839dd 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-symlinks">
+<sect1 id="ch-scripts-symlinks" revision="sysv">
<?dbhtml filename="symlinks.html"?>
<title>Managing Devices</title>
diff --git a/chapter07/symlinksd.xml b/chapter07/symlinksd.xml
index 354ae319a..b0d6460cf 100644
--- a/chapter07/symlinksd.xml
+++ b/chapter07/symlinksd.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-symlinks">
+<sect1 id="ch-scripts-symlinks" revision="systemd">
<?dbhtml filename="symlinks.html"?>
<title>Creating Custom Symlinks to Devices</title>
diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml
index 0c8ca75b9..3f2f84f3f 100644
--- a/chapter07/systemd-custom.xml
+++ b/chapter07/systemd-custom.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-systemd-custom">
+<sect1 id="ch-scripts-systemd-custom" revision="systemd">
<?dbhtml filename="systemd-custom.html"?>
<title>Systemd Usage and Configuration</title>
diff --git a/chapter07/udev.xml b/chapter07/udev.xml
index 7d1f9b59c..f42260fb6 100644
--- a/chapter07/udev.xml
+++ b/chapter07/udev.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-udev">
+<sect1 id="ch-scripts-udev" revision="sysv">
<?dbhtml filename="udev.html"?>
<title>Overview of Device and Module Handling</title>
diff --git a/chapter07/udevd.xml b/chapter07/udevd.xml
index 548a2d2ee..d63592415 100644
--- a/chapter07/udevd.xml
+++ b/chapter07/udevd.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-udev">
+<sect1 id="ch-scripts-udev" revision="systemd">
<?dbhtml filename="udev.html"?>
<title>Device and Module Handling on an LFS System</title>
diff --git a/chapter07/usage.xml b/chapter07/usage.xml
index f0e62b6c3..b710e484b 100644
--- a/chapter07/usage.xml
+++ b/chapter07/usage.xml
@@ -6,7 +6,7 @@
%general-entities;
]>
-<sect1 id="ch-scripts-usage">
+<sect1 id="ch-scripts-usage" revision="sysv">
<?dbhtml filename="usage.html"?>
<title>System V Bootscript Usage and Configuration</title>
diff --git a/index.xml b/index.xml
index 5795b8b8d..d20257f57 100644
--- a/index.xml
+++ b/index.xml
@@ -41,8 +41,11 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acknowledgments.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies.xml"/>
+
+<!-- sysv only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/udev-rules.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
</part>
diff --git a/indexd.xml b/indexd.xml
deleted file mode 100644
index a733fb3c8..000000000
--- a/indexd.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "general.ent">
- %general-entities;
-]>
-<book>
-
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/bookinfo.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-<part id="part1">
-<title>Introduction</title>
-<?dbhtml filename="part1.html"?>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter01/chapter01.xml"/>
-</part>
-
-
-<part id="part2">
-<title>Preparing for the Build</title>
-<?dbhtml filename="part2.html"?>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter02/chapter02.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter03/chapter03.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter04/chapter04.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter05/chapter05.xml"/>
-</part>
-
-<part id="part3">
-<title>Building the LFS System</title>
-<?dbhtml filename="part3.html"?>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter06/chapter06d.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter07/chapter07d.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter08/chapter08.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter09/chapter09.xml"/>
-</part>
-
-<part id="part4">
-<title>Appendices</title>
-<?dbhtml filename="part4.html"?>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acknowledgments.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-</part>
-
-<index/>
-
-</book>
-
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-28 18:04:18 +0000