From fde4f7de29feb3a867ab572415c2eb7722d3d880 Mon Sep 17 00:00:00 2001 From: Archaic Date: Fri, 1 Jul 2005 20:39:25 +0000 Subject: [PATCH] Brought all occurences of LFS-Bootscripts into conformity. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6288 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixb/acknowledgments.xml | 4 ++-- chapter01/changelog.xml | 3 +++ chapter01/how.xml | 2 +- chapter06/devices.xml | 10 ++++----- chapter06/hotplug.xml | 18 ++++++++-------- chapter06/iproute2.xml | 8 +++---- chapter06/psmisc.xml | 11 +++++----- chapter06/util-linux.xml | 4 ++-- chapter07/bootscripts.xml | 5 +++-- chapter07/introduction.xml | 8 +++---- chapter07/network.xml | 12 +++++------ chapter07/udev.xml | 39 ++++++++++++++++------------------- general.ent | 4 ++-- 13 files changed, 64 insertions(+), 64 deletions(-) diff --git a/appendixb/acknowledgments.xml b/appendixb/acknowledgments.xml index 610cea299..36420e0f4 100644 --- a/appendixb/acknowledgments.xml +++ b/appendixb/acknowledgments.xml @@ -35,7 +35,7 @@ From Scratch (ALFS), BLFS and hints project logo creator Nathan -Coulson <nathan@linuxfromscratch.org> – LFS bootscripts +Coulson <nathan@linuxfromscratch.org> – LFS-Bootscripts maintainer Jeroen @@ -90,7 +90,7 @@ Editor, hints and patches projects maintainer Jeremy Utley <jeremy@linuxfromscratch.org> – LFS Technical -Writer, Bugzilla maintainer, LFS bootscripts maintainer, LFS Server +Writer, Bugzilla maintainer, LFS-Bootscripts maintainer, LFS Server co-administrator Zack diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a3e45c619..42c4fb7c1 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -91,6 +91,9 @@ First a summary, then a detailed log. +July 1st, 2005 [archaic]: Brought all occurences of +LFS-Bootscripts into conformity. + June 30th, 2005 [archaic]: Several minor wording changes in chapter 6 (matt). diff --git a/chapter01/how.xml b/chapter01/how.xml index 40a1bad12..a3de5037f 100644 --- a/chapter01/how.xml +++ b/chapter01/how.xml @@ -71,7 +71,7 @@ waiting for package compilation to complete, a user can switch to a different virtual console (VC) or X desktop and continue using the computer as normal. -To finish the installation, the bootscripts are set up in To finish the installation, the LFS-Bootscripts are set up in , and the kernel and boot loader are set up in . contains information on furthering the 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 diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml index 186e29730..721b4e909 100644 --- a/chapter07/bootscripts.xml +++ b/chapter07/bootscripts.xml @@ -10,7 +10,8 @@ Bootscripts -<para>The LFS-Bootscripts package contains a set of bootscripts.</para> +<para>The LFS-Bootscripts package contains a set of scripts to start/stop the +LFS system at bootup/shutdown.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -33,7 +34,7 @@ </sect2> -<sect2 id="contents-bootscripts" role="content"><title>Contents of LFS-bootscripts +Contents of LFS-Bootscripts Installed scripts diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml index b4c8ea547..c54d7fdab 100644 --- a/chapter07/introduction.xml +++ b/chapter07/introduction.xml @@ -7,10 +7,10 @@ Introduction -This chapter details how to install the bootscripts and set them up -properly. Most of these scripts will work without modification, but a -few require additional configuration files because they deal with -hardware-dependent information. +This chapter details how to install and configure the LFS-Bootscripts +package. Most of these scripts will work without modification, but a few require +additional configuration files because they deal with hardware-dependent +information. System-V style init scripts are employed in this book because they are widely used. For additional options, a hint detailing the BSD style diff --git a/chapter07/network.xml b/chapter07/network.xml index dbbf283dc..98bb8f7d7 100644 --- a/chapter07/network.xml +++ b/chapter07/network.xml @@ -54,12 +54,12 @@ Network Interface Card (NIC) during booting of the system. If set to anything but yes the NIC will be ignored by the network script and not brought up. -The SERVICE variable defines the method of -obtaining the IP address. The LFS bootscripts have a modular IP -assignment format, and creating additional files in the /etc/sysconfig/network-devices/services -directory allows other IP assignment methods. This is commonly used -for Dynamic Host Configuration Protocol (DHCP), which is addressed in the BLFS book. +The SERVICE variable defines the method of obtaining the IP +address. The LFS-Bootscripts package has a modular IP assignment format, and +creating additional files in the /etc/sysconfig/network-devices/services directory +allows other IP assignment methods. This is commonly used for Dynamic Host +Configuration Protocol (DHCP), which is addressed in the BLFS book. The GATEWAY variable should contain the default gateway IP address, if one is present. If not, then comment out diff --git a/chapter07/udev.xml b/chapter07/udev.xml index 5cdd2d363..7b9be92ad 100644 --- a/chapter07/udev.xml +++ b/chapter07/udev.xml @@ -82,27 +82,24 @@ built-in drivers registered with sysfs are available to userspace processes and to udev for device node creation. -The S10udev initscript takes care of creating -these device nodes when Linux is booted. This script starts with -registering /sbin/udevsend as a hotplug event handler. -Hotplug events (discussed below) should not be generated during this -stage, but udev is registered just in case they do -occur. The udevstart program then walks through -the /sys filesystem and -creates devices under /dev that -match the descriptions. For example, -/sys/class/tty/vcs/dev contains the string -7:0 This string is used by udevstart -to create /dev/vcs with major number -7 and minor 0. The names and -permissions of the nodes created under the -/dev directory are configured according -to the rules specified in the files within the -/etc/udev/rules.d/ directory. These are -numbered in a similar fashion to the LFS bootscripts. If -udev can't find a rule for the device it is creating, it will -default permissions to 660 and ownership to -root:root. +The S10udev initscript takes care of creating these +device nodes when Linux is booted. This script starts with registering +/sbin/udevsend as a hotplug event handler. Hotplug events +(discussed below) should not be generated during this stage, but +udev is registered just in case they do occur. The +udevstart program then walks through the /sys filesystem and creates devices under +/dev that match the descriptions. For +example, /sys/class/tty/vcs/dev contains the string +7:0 This string is used by udevstart to create +/dev/vcs with major number 7 and minor +0. The names and permissions of the nodes created under +the /dev directory are configured +according to the rules specified in the files within the /etc/udev/rules.d/ directory. These are numbered in +a similar fashion to the LFS-Bootscripts package. If udev +can't find a rule for the device it is creating, it will default permissions to +660 and ownership to root:root. Once the above stage is complete, all devices that were already present and have compiled-in drivers will be available for use. What diff --git a/general.ent b/general.ent index 745ec0459..eaaf0568b 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - - + +