From 036393e17a78a12fbc093c78b8becaf8eb736a80 Mon Sep 17 00:00:00 2001 From: Larry Lawrence Date: Wed, 9 Apr 2003 00:10:43 +0000 Subject: [PATCH] more corner sweeping git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@838 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- basicnet/netprogs/ncftp/ncftp-config.xml | 2 +- general/genlib/stlport/stlport-exp.xml | 3 ++- general/genlib/stlport/stlport.ent | 2 +- general/graphlib/libungif/libungif-intro.xml | 2 +- general/prog/jdk/j2sdk-intro.xml | 2 +- introduction/important/unpacking.xml | 2 +- introduction/welcome/acknowledgments.xml | 2 +- introduction/welcome/which.xml | 2 +- multimedia/libdriv/nas/nas-intro.xml | 2 +- postlfs/config/bootdisk.xml | 20 +++++++++++--------- postlfs/config/profile.xml | 3 ++- postlfs/security/shadow/shadow-inst.xml | 2 +- preface/organization.xml | 6 +++--- 13 files changed, 27 insertions(+), 23 deletions(-) diff --git a/basicnet/netprogs/ncftp/ncftp-config.xml b/basicnet/netprogs/ncftp/ncftp-config.xml index 30a542f6a5..7a42f00d99 100644 --- a/basicnet/netprogs/ncftp/ncftp-config.xml +++ b/basicnet/netprogs/ncftp/ncftp-config.xml @@ -8,7 +8,7 @@ Configuration Information -Most ncftp configuration is done whilst in the program and the +Most ncftp configuration is done while in the program and the configuration files are dealt with automatically. One exception to this is ~/.ncftp/prefs_v3. There are various options to alter in there, including: diff --git a/general/genlib/stlport/stlport-exp.xml b/general/genlib/stlport/stlport-exp.xml index fd34a332f6..30c5c43489 100644 --- a/general/genlib/stlport/stlport-exp.xml +++ b/general/genlib/stlport/stlport-exp.xml @@ -1,7 +1,8 @@ Command explanations -GCC_VERSION=... : STLport needs the location of the c++ headers, which are installed in +GCC_VERSION=... : STLport needs the +location of the C++ headers, which are installed in /usr/include/c++/$GCC_VERSION if installed as per the instructions in LFS. sed -e ... : Replace the location where STLport diff --git a/general/genlib/stlport/stlport.ent b/general/genlib/stlport/stlport.ent index 6ec8c03a4b..c9c39a791d 100644 --- a/general/genlib/stlport/stlport.ent +++ b/general/genlib/stlport/stlport.ent @@ -8,4 +8,4 @@ - + diff --git a/general/graphlib/libungif/libungif-intro.xml b/general/graphlib/libungif/libungif-intro.xml index c2d5a08f5c..57b80addcf 100644 --- a/general/graphlib/libungif/libungif-intro.xml +++ b/general/graphlib/libungif/libungif-intro.xml @@ -19,7 +19,7 @@ legal issue with LZW compression (which Unisys claims a patent on). Reading gifs is not a problem as the uncompression routines do not seem to be limited in this way. Note that this has in the past been disputed. The best way to avoid this whole mess is to simply use -libungif for looking at gif images on the web, whilst in any pages which +libungif for looking at gif images on the web, while in any pages which you design, use the open source png format instead (which uses, not surprisingly, the libpng library) which has no patent issues at all. diff --git a/general/prog/jdk/j2sdk-intro.xml b/general/prog/jdk/j2sdk-intro.xml index 0ffa199278..094ddd12d0 100644 --- a/general/prog/jdk/j2sdk-intro.xml +++ b/general/prog/jdk/j2sdk-intro.xml @@ -32,7 +32,7 @@ downloading the source also download the mozilla headers package available at the same location. -Download the patches for j2sdk source from +Download the patches for j2sdk source from . If you have difficulties in building the jdk, check out the javafromscratch diff --git a/introduction/important/unpacking.xml b/introduction/important/unpacking.xml index e43b81b2de..bb763e225f 100644 --- a/introduction/important/unpacking.xml +++ b/introduction/important/unpacking.xml @@ -14,7 +14,7 @@ you can download the package. We do however keep a selection of patches available via http/ftp. These are referenced as needed in the installation instructions. -Whilst you can keep the source tarballs anywhere you like, we +While you can keep the source tarballs anywhere you like, we assume that you have unpacked them and unzipped any required patches into /usr/src. diff --git a/introduction/welcome/acknowledgments.xml b/introduction/welcome/acknowledgments.xml index 6897f394fa..96c106dc18 100644 --- a/introduction/welcome/acknowledgments.xml +++ b/introduction/welcome/acknowledgments.xml @@ -8,7 +8,7 @@ contributions toward the BLFS and LFS projects: All those people listed on the Credits page for submitting -patches, instructions and corrections to the book. The current editor would +patches, instructions and corrections to the book. The former editor would especially like to thank Bruce, Larry and Billy for their enormous inputs to the project. diff --git a/introduction/welcome/which.xml b/introduction/welcome/which.xml index f4913ef4ce..cb6d6b32d2 100644 --- a/introduction/welcome/which.xml +++ b/introduction/welcome/which.xml @@ -22,7 +22,7 @@ to turn next. This deals with not just configuration but also Security linkend="postlfs-filesystems"/>), Editors () and Shells (). Indeed, you may wish to reference certain parts of this chapter (especially -the sections on Editors and Filesystems) whilst building your LFS system. +the sections on Editors and Filesystems) while building your LFS system. Following these basic items, most people will want to at least browse through the part of the book. This part contains diff --git a/multimedia/libdriv/nas/nas-intro.xml b/multimedia/libdriv/nas/nas-intro.xml index f2cd07725e..01bea029c3 100644 --- a/multimedia/libdriv/nas/nas-intro.xml +++ b/multimedia/libdriv/nas/nas-intro.xml @@ -11,6 +11,6 @@ Estimated Disk space required: &nas-buildsize; transport system. It can be described as the audio equivalent of an X server. -Download the bison patch from +Download the nas patch from . diff --git a/postlfs/config/bootdisk.xml b/postlfs/config/bootdisk.xml index 46963e6b36..05b4d753cc 100644 --- a/postlfs/config/bootdisk.xml +++ b/postlfs/config/bootdisk.xml @@ -31,10 +31,10 @@ only need to set up the minimum directories. Next, we will set up the device files. I use devfs on my system, so the following command works well, as I only have the devices I use anyway. If you used MAKEDEV to create your devices, you'll want to -trim the /mnt/loop1/dev directory to reclaim the inode space wasted -by all of the devices in the dev directory you don't use. +trim the /mnt/loop1/dev directory to reclaim the inode space wasted +by all of the devices in the dev directory you don't use. cp -dpR /dev/* /mnt/loop1/dev -Now to tend to the /etc directory. To start, all we will do is use +Now to tend to the /etc directory. To start, all we will do is use the passwd and group file that worked for our static chroot environment when we built LFS. We'll also copy the startup scripts over and a few other files that serve well as starting points. @@ -60,12 +60,14 @@ EOF To prevent automatic mounting of hard drive partitions, make sure to add the noauto option in their fstab entry. Also, add the -following entries to the /mnt/loop1/etc/fstab to assist with mounting our +following entries to the /mnt/loop1/etc/fstab to assist with mounting our floppy and the ram image /dev/ram0 / ext2 defaults /dev/fd0 / ext2 defaults -Next, we will install busybox onto the image. Busybox incorporates many of the *nix functions into a single small executable file. +Next, we will install busybox +onto the image. Busybox incorporates many of the unix functions into a single small executable file. make && make PREFIX=/mnt/loop1 install && cp -ax /var/utmp /mnt/loop1/var && @@ -88,7 +90,7 @@ strip --strip-deb /tmp/ld-linux.so.2 /tmp/libc.so.6 /tmp/libdl.so.2 && mv /tmp/ld-linux.so.2 /tmp/libc.so.6 /tmp/libdl.so.2 /mnt/loop1/lib/ We will also need to set up an rc script to handle the devfsd startup. -Put this in /mnt/loop1/etc/init.d/rcS +Put this in /mnt/loop1/etc/init.d/rcS. #!/bin/sh mount -t devfs devfs /dev /sbin/devfsd /dev @@ -99,7 +101,7 @@ make the smallest possible compressed image. umount /mnt/loop1 && dd if=/tmp/rfloppy bs=1k | gzip -v9 > rootfs.gz ls -l rootfs.gz to make sure it will fit on the diskette. -make a custom kernel that is optimized for size. Include only those features +Make a custom kernel that is optimized for size. Include only those features you will need to rescue your system. no sense in building in support for things like xfree86 dri, etc, as most rescues are performed from the command prompt. @@ -112,8 +114,8 @@ like xfree86 dri, etc, as most rescues are performed from the command prompt. In this example the rescueimage(KERNEL) was 429+1 blocks in size. We will remember this for the next command. We now write the root file -system right after the kernel on the floppy. by doing 16384+429+1= -16814 +system right after the kernel on the floppy by doing 16384+429+1= +16814. rdev -r /dev/floppy/0 16814 diff --git a/postlfs/config/profile.xml b/postlfs/config/profile.xml index e8a59d735f..189b4717ab 100644 --- a/postlfs/config/profile.xml +++ b/postlfs/config/profile.xml @@ -8,7 +8,8 @@ help create an environment to run in. Each file has a specific use and may affect login and interactive environments differently. An interactive login shell is started after a successful login by -/bin/login by reading the /etc/passwd file. An +/bin/login by reading the +/etc/passwd file. An interactive non-login shell is started at the command line (e.g. [prompt]$/bin/bash). A non-interactive shell is usually present when a shell script is running. It is non-interactive diff --git a/postlfs/security/shadow/shadow-inst.xml b/postlfs/security/shadow/shadow-inst.xml index f10ee7c61b..50592179e0 100644 --- a/postlfs/security/shadow/shadow-inst.xml +++ b/postlfs/security/shadow/shadow-inst.xml @@ -4,7 +4,7 @@ shadow requires: -Download the patch for shadow from +Download the patch for shadow from . Reinstall shadow by running the following commands: diff --git a/preface/organization.xml b/preface/organization.xml index f80c186510..df6374678d 100644 --- a/preface/organization.xml +++ b/preface/organization.xml @@ -28,8 +28,8 @@ the simple static IP setup given in the main LFS book. bulk of this part. Part VI - Server Networking -Here we deal with setting up mail and other servers (such as SSH, CVS -etc). +Here we deal with setting up mail and other servers (such as SSH, +CVS, etc.). Part VII - Content Serving In this part we deal with databases and web server software (including @@ -45,7 +45,7 @@ it, this part covers it. Part X - Gnome Gnome is the main alternative to KDE in the Desktop Environment arena -and we cover both gnome-1.4 and gnome-2.0 here. +and we cover both gnome-1.4 and gnome-2.2 here. Part XI - X Software Office programs and graphical web browsers are important to most