diff -Naur BOOK.orig/bootscripts/contrib/lsb/lib/init-functions BOOK/bootscripts/contrib/lsb/lib/init-functions
old
|
new
|
|
226 | 226 | return 3 # Program is not running |
227 | 227 | fi |
228 | 228 | |
229 | | lpids=`head -n 1 ${pidfile}` |
| 229 | lpids=`sed 1q ${pidfile}` |
230 | 230 | for pid in ${lpids} |
231 | 231 | do |
232 | 232 | if [ "${pid}" -ne "$$" -a "${pid}" -ne "${PPID}" ]; then |
diff -Naur BOOK.orig/bootscripts/contrib/lsb-v3/lsb/init-functions BOOK/bootscripts/contrib/lsb-v3/lsb/init-functions
old
|
new
|
|
401 | 401 | if [ -n "${pidfile}" -a -e "${pidfile}" ] |
402 | 402 | then |
403 | 403 | # use the value in the first line of the pidfile |
404 | | pidlist=`/bin/head -n1 "${pidfile}"` |
405 | | # This can optionally be written as 'sed 1q' to repalce 'head -n1' |
406 | | # should LFS move /bin/head to /usr/bin/head |
| 404 | pidlist=`/bin/sed 1q "${pidfile}"` |
407 | 405 | else |
408 | 406 | # use pidof |
409 | 407 | pidlist=`pidof "${program}"` |
diff -Naur BOOK.orig/bootscripts/contrib/lsb-v3/lsb/manage-functions BOOK/bootscripts/contrib/lsb-v3/lsb/manage-functions
old
|
new
|
|
57 | 57 | diff=$(( ${end} - ${begin} )) |
58 | 58 | # assign the entire LSB header information as a single string to the |
59 | 59 | # fullheaders[] array |
60 | | fullheaders["${count}"]=$(head -n "${end}" "${file}" \ |
| 60 | fullheaders["${count}"]=$(sed "${end}q" "${file}" \ |
61 | 61 | | tail -n "${diff}") |
62 | 62 | count=$(( ${count} + 1 )) |
63 | 63 | unset begin |
diff -Naur BOOK.orig/bootscripts/lfs/init.d/functions BOOK/bootscripts/lfs/init.d/functions
old
|
new
|
|
444 | 444 | return 3 # Program is not running |
445 | 445 | fi |
446 | 446 | |
447 | | lpids=`head -n 1 ${pidfile}` |
| 447 | lpids=`sed 1q ${pidfile}` |
448 | 448 | for pid in ${lpids} |
449 | 449 | do |
450 | 450 | if [ "${pid}" -ne "$$" -a "${pid}" -ne "${PPID}" ]; then |
diff -Naur BOOK.orig/chapter06/coreutils.xml BOOK/chapter06/coreutils.xml
old
|
new
|
|
125 | 125 | mv -v /usr/bin/chroot /usr/sbin</userinput></screen> |
126 | 126 | |
127 | 127 | <para>Some of the scripts in the LFS-Bootscripts package depend on |
128 | | <command>head</command>, <command>sleep</command>, and |
129 | | <command>nice</command>. As <filename class="directory">/usr</filename> |
130 | | may not be available during the early stages of booting, those binaries |
131 | | need to be on the root partition:</para> |
| 128 | <command>sleep</command> and <command>nice</command>. As |
| 129 | <filename class="directory">/usr</filename> may not be available |
| 130 | during the early stages of booting, those binaries need to be on |
| 131 | the root partition:</para> |
132 | 132 | |
133 | | <screen><userinput remap="install">mv -v /usr/bin/{head,sleep,nice} /bin</userinput></screen> |
| 133 | <screen><userinput remap="install">mv -v /usr/bin/{sleep,nice} /bin</userinput></screen> |
134 | 134 | |
135 | 135 | </sect2> |
136 | 136 | |