From fde4f7de29feb3a867ab572415c2eb7722d3d880 Mon Sep 17 00:00:00 2001 From: Archaic Date: Fri, 1 Jul 2005 20:39:25 +0000 Subject: Brought all occurences of LFS-Bootscripts into conformity. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6288 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/devices.xml | 10 +++++----- chapter06/hotplug.xml | 18 +++++++++--------- chapter06/iproute2.xml | 8 ++++---- chapter06/psmisc.xml | 11 +++++------ chapter06/util-linux.xml | 4 ++-- 5 files changed, 25 insertions(+), 26 deletions(-) (limited to 'chapter06') diff --git a/chapter06/devices.xml b/chapter06/devices.xml index e094f1528..22bb3bdb7 100644 --- a/chapter06/devices.xml +++ b/chapter06/devices.xml @@ -30,8 +30,8 @@ filesystem (such as tmpfs) on the /dev directory, and allow the devices to be created dynamically on that virtual filesystem as they are detected or accessed. This is generally done during the boot process. Since this new system -has not been booted, it is necessary to do what the bootscripts would otherwise -do by mounting /dev: +has not been booted, it is necessary to do what the LFS-Bootscripts package would +otherwise do by mounting /dev: mount -n -t tmpfs none /dev @@ -51,9 +51,9 @@ chown root:tty /dev/{console,ptmx,tty} There are some symlinks and directories required by LFS that are created -during system startup by the bootscripts. Since this is a chroot environment and -not a booted environment, those symlinks and directories need to be created -here: +during system startup by the LFS-Bootscripts package. Since this is a chroot +environment and not a booted environment, those symlinks and directories need to +be created here: ln -s /proc/self/fd /dev/fd ln -s /proc/self/fd/0 /dev/stdin diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml index eccb9de52..9af9cefbe 100644 --- a/chapter06/hotplug.xml +++ b/chapter06/hotplug.xml @@ -42,13 +42,13 @@ running kernel. cp etc/hotplug/pnp.distmap /etc/hotplug -Remove the init script that Hotplug installs, since we're going to be -using the script included with LFS-Bootscripts: +Remove the init script that Hotplug installs since we are going to be +using the script included in the LFS-Bootscripts package: rm -rf /etc/init.d -Network device hotplugging is not supported by LFS-Bootscripts yet. For -that reason, remove the network hotplug agent: +Network device hotplugging is not yet supported by the LFS-Bootscripts +package. For that reason, remove the network hotplug agent: rm -f /etc/hotplug/net.agent @@ -91,11 +91,11 @@ sortas="b-hotplug">hotplug /etc/hotplug/*.rc These scripts are used for cold plugging, i.e., detecting and acting upon -hardware already present during system startup. They are called by the -hotplug initscript that comes from the LFS-Bootscripts -package. The *.rc scripts try to recover hotplug events that -were lost during system boot because, for example, the root filesystem was not -mounted by the kernel +hardware already present during system startup. They are called by the +hotplug initscript included in the LFS-Bootscripts package. +The *.rc scripts try to recover hotplug events that were lost +during system boot because, for example, the root filesystem was not mounted by +the kernel /etc/hotplug/*.rc diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index 20701c0e5..6610669a0 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -56,10 +56,10 @@ SBINDIR=/sbin - This makes sure that the IPRoute2 binaries will install into - /sbin. This is the correct - location according to the FHS, because some of the IPRoute2 binaries are used - in the bootscripts. + This ensures that the IPRoute2 binaries will install into + /sbin. This is the correct location + according to the FHS, because some of the IPRoute2 binaries are used by + the LFS-Bootscripts package. diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index f430462d5..6952268a1 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -40,12 +40,11 @@ GCC, Gettext, Glibc, Grep, Make, Ncurses, and Sed --exec-prefix="" -This causes the binaries to be installed in /bin instead of /usr/bin. Because the Psmisc programs are -often used in bootscripts, they should be available when the /usr file system is not -mounted. +This ensures that the Psmisc binaries will install into +/bin instead of /usr/bin. This is the correct location according to +the FHS, because some of the Psmisc binaries are used by the LFS-Bootscripts +package. diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 6fd5b64d1..93e3e2a13 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -82,8 +82,8 @@ by Glibc) from being built and installed again. This package does not come with a test suite. Install the package and move the logger binary to -/bin as it is needed by the bootscripts: - +/bin as it is needed by the +LFS-Bootscripts package: make HAVE_KILL=yes HAVE_SLN=yes install mv /usr/bin/logger /bin -- cgit v1.2.3-54-g00ecf