aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Canales Esparcia <manuel@linuxfromscratch.org>2006-07-30 19:30:21 +0000
committerManuel Canales Esparcia <manuel@linuxfromscratch.org>2006-07-30 19:30:21 +0000
commit76f695dc8b28afa5f69956d6228e16ff320c46ba (patch)
treeaf5f17060d6eda999360ca23b7a8c068c0d10df9
parent8035189ca68d9823f268e29bdef2092a5f4e2990 (diff)
Splitted some commands to fit into PDF page size.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.2/BOOK@7716 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter06/shadow.xml3
-rw-r--r--chapter07/network.xml16
-rw-r--r--chapter07/symlinks.xml24
-rw-r--r--chapter08/fstab.xml9
4 files changed, 33 insertions, 19 deletions
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 861c6ed6d..87fc77a05 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -133,7 +133,8 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen>
<note>
<para>If you built Shadow with Cracklib support, run the following:</para>
-<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</userinput></screen>
+<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' \
+ /etc/login.defs</userinput></screen>
</note>
<para>Move a misplaced program to its proper location:</para>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 3e8a4ad36..5e9d615d3 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -48,9 +48,11 @@
invent a descriptive name, such as <quote>realtek</quote>, and create
Udev rules similar to the following:</para>
-<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/26-network.rules &lt;&lt; "EOF"
-<literal>ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="<replaceable>00:e0:4c:12:34:56</replaceable>", NAME="<replaceable>realtek</replaceable>"
-ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="<replaceable>00:a0:c9:78:9a:bc</replaceable>", NAME="<replaceable>intel</replaceable>"</literal>
+<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/26-network.rules &lt;&lt; EOF
+<literal>ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="<replaceable>00:e0:4c:12:34:56</replaceable>", \
+ NAME="<replaceable>realtek</replaceable>"
+ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="<replaceable>00:a0:c9:78:9a:bc</replaceable>", \
+ NAME="<replaceable>intel</replaceable>"</literal>
EOF</userinput></screen>
<!-- Yes, I know that VLANs are beyond BLFS. This is not the reason to get them
@@ -59,9 +61,11 @@ EOF</userinput></screen>
<para>If you are going to use the bus position as a key, create
Udev rules similar to the following:</para>
-<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/26-network.rules &lt;&lt; "EOF"
-<literal>ACTION=="add", SUBSYSTEM=="net", BUS=="<replaceable>pci</replaceable>", ID=="<replaceable>0000:00:0c.0</replaceable>", NAME="<replaceable>realtek</replaceable>"
-ACTION=="add", SUBSYSTEM=="net", BUS=="<replaceable>pci</replaceable>", ID=="<replaceable>0000:00:0d.0</replaceable>", NAME="<replaceable>intel</replaceable>"</literal>
+<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/26-network.rules &lt;&lt; EOF
+<literal>ACTION=="add", SUBSYSTEM=="net", BUS=="<replaceable>pci</replaceable>", ID=="<replaceable>0000:00:0c.0</replaceable>", \
+ NAME="<replaceable>realtek</replaceable>"
+ACTION=="add", SUBSYSTEM=="net", BUS=="<replaceable>pci</replaceable>", ID=="<replaceable>0000:00:0d.0</replaceable>", \
+ NAME="<replaceable>intel</replaceable>"</literal>
EOF</userinput></screen>
<para>These rules will always rename the network cards to
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index f807f5bd2..491fef925 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -32,11 +32,13 @@
location of the device on the bus. If you are going to use the first
approach, create a file similar to the following:</para>
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt;"EOF"
+<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
<literal>
# Custom CD-ROM symlinks
-SUBSYSTEM=="block", ENV{ID_MODEL}=="SAMSUNG_CD-ROM_SC-148F", ENV{ID_REVISION}=="PS05", SYMLINK+="cdrom"
-SUBSYSTEM=="block", ENV{ID_MODEL}=="PHILIPS_CDD5301", ENV{ID_SERIAL}=="5VO1306DM00190", SYMLINK+="cdrom1 dvd"
+SUBSYSTEM=="block", ENV{ID_MODEL}=="SAMSUNG_CD-ROM_SC-148F", \
+ ENV{ID_REVISION}=="PS05", SYMLINK+="cdrom"
+SUBSYSTEM=="block", ENV{ID_MODEL}=="PHILIPS_CDD5301", \
+ ENV{ID_SERIAL}=="5VO1306DM00190", SYMLINK+="cdrom1 dvd"
</literal>
EOF</userinput></screen>
@@ -55,11 +57,13 @@ EOF</userinput></screen>
<para>The second approach yields:</para>
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt;"EOF"
+<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
<literal>
# Custom CD-ROM symlinks
-SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", ENV{ID_PATH}=="pci-0000:00:07.1-ide-0:1", SYMLINK+="cdrom"
-SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", ENV{ID_PATH}=="pci-0000:00:07.1-ide-1:1", SYMLINK+="cdrom1 dvd"
+SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
+ ENV{ID_PATH}=="pci-0000:00:07.1-ide-0:1", SYMLINK+="cdrom"
+SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
+ ENV{ID_PATH}=="pci-0000:00:07.1-ide-1:1", SYMLINK+="cdrom1 dvd"
</literal>
EOF</userinput></screen>
@@ -105,11 +109,13 @@ EOF</userinput></screen>
<para>Then write rules that create the symlinks, e.g.:</para>
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/83-duplicate_devs.rules &lt;&lt;"EOF"
+<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/83-duplicate_devs.rules &lt;&lt; EOF
<literal>
# Persistent symlinks for webcam and tuner
-KERNEL=="video*", SYSFS{idProduct}=="1910", SYSFS{idVendor}=="0d81", SYMLINK+="webcam"
-KERNEL=="video*", SYSFS{device}=="0x036f", SYSFS{vendor}=="0x109e", SYMLINK+="tvtuner"
+KERNEL=="video*", SYSFS{idProduct}=="1910", SYSFS{idVendor}=="0d81", \
+ SYMLINK+="webcam"
+KERNEL=="video*", SYSFS{device}=="0x036f", SYSFS{vendor}=="0x109e", \
+ SYMLINK+="tvtuner"
</literal>
EOF</userinput></screen>
diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml
index f5e1ba626..2c1b056f3 100644
--- a/chapter08/fstab.xml
+++ b/chapter08/fstab.xml
@@ -66,15 +66,18 @@ EOF</userinput></screen>
in order to mount USB flash drives, a ru_RU.KOI8-R user would need the
following line in <filename>/etc/fstab</filename>:</para>
-<screen>/dev/sda1 /media/flash vfat noauto,user,quiet,showexec,iocharset=koi8r,codepage=866 0 0</screen>
+<screen><literal>/dev/sda1 /media/flash vfat
+ noauto,user,quiet,showexec,iocharset=koi8r,codepage=866 0 0</literal></screen>
<para>The corresponding line for ru_RU.UTF-8 users is:</para>
-<screen>/dev/sda1 /media/flash vfat noauto,user,quiet,showexec,iocharset=utf8,codepage=866 0 0</screen>
+<screen><literal>/dev/sda1 /media/flash vfat
+ noauto,user,quiet,showexec,iocharset=utf8,codepage=866 0 0</literal></screen>
<note><para>In the latter case, the kernel emits the following message:</para>
-<screen><computeroutput>FAT: utf8 is not a recommended IO charset for FAT filesystems, filesystem will be case sensitive!</computeroutput></screen>
+<screen><computeroutput>FAT: utf8 is not a recommended IO charset for FAT filesystems,
+ filesystem will be case sensitive!</computeroutput></screen>
<para>This negative recommendation should be ignored, since all other values
of the <quote>iocharset</quote> option result in wrong display of filenames in