diff options
| -rw-r--r-- | chapter01/askforhelp.xml | 4 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 5 | ||||
| -rw-r--r-- | chapter07/cleanup.xml | 13 | ||||
| -rw-r--r-- | chapter10/grub.xml | 4 | ||||
| -rw-r--r-- | chapter10/kernel.xml | 8 | ||||
| -rw-r--r-- | chapter11/theend.xml | 27 | ||||
| -rw-r--r-- | prologue/bookinfo.xml | 3 |
7 files changed, 16 insertions, 48 deletions
diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml index 6367d0edd..3412f0a60 100644 --- a/chapter01/askforhelp.xml +++ b/chapter01/askforhelp.xml @@ -38,9 +38,7 @@ <itemizedlist> <listitem> - <para>The version of the book being used (in this case - <phrase revision="sysv">&version;</phrase> - <phrase revision="systemd">&versiond;</phrase>)</para> + <para>The version of the book being used (in this case &version;</para> </listitem> <listitem> <para>The host distribution and version being used to create LFS</para> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6c4dda462..ea0585ada 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -10,10 +10,7 @@ <title>Changelog</title> - <para>This is version - <phrase revision="sysv">&version;</phrase> - <phrase revision="systemd">&versiond;</phrase> - of the Linux From Scratch book, dated + <para>This is version &version; of the Linux From Scratch book, dated &releasedate;. If this book is more than six months old, a newer and better version is probably already available. To find out, please check one of the mirrors via <ulink url="&lfs-root;mirrors.html"/>.</para> diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml index 47cf91094..c50c65f06 100644 --- a/chapter07/cleanup.xml +++ b/chapter07/cleanup.xml @@ -127,12 +127,9 @@ umount $LFS/{sys,proc,run,dev}</userinput></screen> </para> </note> -<screen role="nodump" revision="sysv"><userinput>cd $LFS +<screen role="nodump"><userinput>cd $LFS tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen> -<screen role="nodump" revision="systemd"><userinput>cd $LFS -tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen> - </sect2> <sect2> @@ -157,14 +154,10 @@ tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen> environment variable is not set for the root user, it will destroy your entire host system. YOU ARE WARNED.</para></warning> -<screen role="nodump" revision="sysv"><computeroutput>cd $LFS -rm -rf ./* +<screen role="nodump"><computeroutput>cd $LFS +rm -rf ./* tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen> -<screen role="nodump" revision="systemd"><computeroutput>cd $LFS -rm -rf ./* -tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen> - <para> Again, double check that the environment has been setup properly and continue building the rest of the system. diff --git a/chapter10/grub.xml b/chapter10/grub.xml index c32783e9a..b35d75540 100644 --- a/chapter10/grub.xml +++ b/chapter10/grub.xml @@ -156,8 +156,8 @@ set timeout=5 insmod ext2 set root=(hd0,2) -menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" { - linux /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro +menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" { + linux /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro }</literal> EOF</userinput></screen> diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index 0aec043ef..c19fc0339 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -227,7 +227,7 @@ File systems ---> <screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen> -<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen> +<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen> <para><filename>System.map</filename> is a symbol file for the kernel. It maps the function entry points of every function in the kernel API, @@ -336,8 +336,7 @@ EOF</userinput></screen> <seglistitem> <seg>config-&linux-version;, - <phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase> - <phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase> + vmlinuz-&linux-version;-lfs-&version; and System.map-&linux-version;</seg> <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg> </seglistitem> @@ -359,8 +358,7 @@ EOF</userinput></screen> </varlistentry> <varlistentry id="lfskernel"> - <term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term> - <term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term> + <term><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term> <listitem> <para>The engine of the Linux system. When turning on the computer, the kernel is the first part of the operating system that gets loaded. diff --git a/chapter11/theend.xml b/chapter11/theend.xml index 6a5f8ad7a..8470948a3 100644 --- a/chapter11/theend.xml +++ b/chapter11/theend.xml @@ -31,37 +31,28 @@ out which LFS version is installed on the system. Create this file by running:</para> -<screen revision="sysv"><userinput>echo &version; > /etc/lfs-release</userinput></screen> +<screen><userinput>echo &version; > /etc/lfs-release</userinput></screen> -<screen revision="systemd"><userinput>echo &versiond; > /etc/lfs-release</userinput></screen> - - <para>Two files describing the installed system may be used by packages - that can be installed on the system later, either in binary form or by building + <para>Two files describing the installed system may be used by packages that + can be installed on the system later, either in binary form or by building them.</para> <para>The first one shows the status of your new system with respect to the Linux Standards Base (LSB). To create this file, run:</para> -<screen revision="sysv"><userinput>cat > /etc/lsb-release << "EOF" +<screen><userinput>cat > /etc/lsb-release << "EOF" DISTRIB_ID="Linux From Scratch" DISTRIB_RELEASE="&version;" DISTRIB_CODENAME="<your name here>" DISTRIB_DESCRIPTION="Linux From Scratch" EOF</userinput></screen> -<screen revision="systemd"><userinput>cat > /etc/lsb-release << "EOF" -DISTRIB_ID="Linux From Scratch" -DISTRIB_RELEASE="&versiond;" -DISTRIB_CODENAME="<your name here>" -DISTRIB_DESCRIPTION="Linux From Scratch" -EOF</userinput></screen> - <para>The second one contains roughly the same information, and is used by systemd and some graphical desktop environments. To create this file, run:</para> -<screen revision="sysv"><userinput>cat > /etc/os-release << "EOF" +<screen><userinput>cat > /etc/os-release << "EOF" NAME="Linux From Scratch" VERSION="&version;" ID=lfs @@ -69,14 +60,6 @@ PRETTY_NAME="Linux From Scratch &version;" VERSION_CODENAME="<your name here>" EOF</userinput></screen> -<screen revision="systemd"><userinput>cat > /etc/os-release << "EOF" -NAME="Linux From Scratch" -VERSION="&versiond;" -ID=lfs -PRETTY_NAME="Linux From Scratch &versiond;" -VERSION_CODENAME="<your name here>" -EOF</userinput></screen> - <para>Be sure to put some sort of customization for the fields 'DISTRIB_CODENAME' and 'VERSION_CODENAME' to make the system uniquely yours.</para> diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml index 73d06410d..aec113b20 100644 --- a/prologue/bookinfo.xml +++ b/prologue/bookinfo.xml @@ -7,8 +7,7 @@ <bookinfo> <title>Linux From Scratch</title> - <subtitle revision='sysv' >Version &version; </subtitle> - <subtitle revision='systemd'>Version &versiond;</subtitle> + <subtitle>Version &version; </subtitle> <subtitle>Published &releasedate;</subtitle> <authorgroup> |