Add /etc/sysconfig to Creating Directories

Update boot logging to remove terminal escape sequences


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9575 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 38 insertions, 29 deletions

diff --git a/bootscripts/lfs/init.d/functions b/bootscripts/lfs/init.d/functions
index e91ce5b5a..c9dbcef89 100644
--- a/bootscripts/lfs/init.d/functions
+++ b/bootscripts/lfs/init.d/functions
@@ -136,36 +136,36 @@ echo_ok()
 {
    ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]"
    ${ECHO} -e "${NORMAL}"
-        boot_mesg_flush
-   ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]" >> /run/var/bootlog
-   ${ECHO} -e "${NORMAL}" >> /run/var/bootlog
+   boot_mesg_flush
+
+   ${ECHO} -e "[ OK ]" >> /run/var/bootlog
 }
 
 echo_failure()
 {
    ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]"
    ${ECHO} -e "${NORMAL}"
-        boot_mesg_flush
-   ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]" >> /run/var/bootlog
-   ${ECHO} -e "${NORMAL}" >> /run/var/bootlog
+    boot_mesg_flush
+
+   ${ECHO} -e "[ FAIL]"  >> /run/var/bootlog
 }
 
 echo_warning()
 {
    ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]"
    ${ECHO} -e "${NORMAL}"
-        boot_mesg_flush
-   ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]" >> /run/var/bootlog
-   ${ECHO} -e "${NORMAL}" >> /run/var/bootlog
+   boot_mesg_flush
+
+   ${ECHO} -e "[ WARN ]"  >> /run/var/bootlog
 }
 
 echo_skipped()
 {
    ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} SKIP ${BRACKET}]"
    ${ECHO} -e "${NORMAL}"
-        boot_mesg_flush
-   ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} SKIP ${BRACKET}]" >> /run/var/bootlog
-   ${ECHO} -e "${NORMAL}" >> /run/var/bootlog
+   boot_mesg_flush
+
+   ${ECHO} -e "  [ SKIP ]" >> /run/var/bootlog
 }
 
 wait_for_user()
@@ -713,9 +713,8 @@ log_success_msg()
 {
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${SUCCESS}""  OK  ""${BRACKET}""]""${NORMAL}"
-   ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" >> /run/var/bootlog
-   ${ECHO} -e "${SET_COL}""${BRACKET}""[""${SUCCESS}""  OK  ""${BRACKET}""]""${NORMAL}" \
-         >> /run/var/bootlog
+
+   ${ECHO} -n -e "${@}  [ OK ]"  >> /run/var/bootlog
    return 0
 }
 
@@ -736,9 +735,8 @@ log_success_msg()
 log_failure_msg() {
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}"
-   ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" >> /run/var/bootlog
-   ${ECHO} -e "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}" \
-         >> /run/var/bootlog
+
+   ${ECHO} -e "${@}  [ FAIL ]" >> /run/var/bootlog
    return 0
 }
 
@@ -759,9 +757,8 @@ log_failure_msg() {
 log_warning_msg() {
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}"
-   ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" >> /run/var/bootlog
-   ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}" \
-         >> /run/var/bootlog
+
+   ${ECHO} -e "${@}  [ WARN ]" >> /run/var/bootlog
    return 0
 }
 
@@ -782,9 +779,8 @@ log_warning_msg() {
 log_skipped_msg() {
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" SKIP ""${BRACKET}""]""${NORMAL}"
-   ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" >> /run/var/bootlog
-   ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" SKIP ""${BRACKET}""]""${NORMAL}" \
-         >> /run/var/bootlog
+
+   ${ECHO} -e "${@}  [ SKIP ]" >> /run/var/bootlog
    return 0
 }
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a6f24ebec..cab4241aa 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,19 @@
 
 -->
     <listitem>
+      <para>2011-08-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add /etc/sysconfig to Creating Directories.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update boot logging to remove terminal escape
+          sequences.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2011-08-01</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index 6dc5d3455..121a2c8f5 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -13,7 +13,7 @@
   <para>It is time to create some structure in the LFS file system. Create a
   standard directory tree by issuing the following commands:</para>
 
-<screen><userinput>mkdir -pv /{bin,boot,etc/opt,home,lib,mnt,opt,run}
+<screen><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib,mnt,opt,run}
 mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
 install -dv -m 0750 /root
 install -dv -m 1777 /tmp /var/tmp
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 9556c0c05..a13af483d 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -120,7 +120,7 @@ done</userinput></screen>
     depends on the files in <filename
     class="directory">/etc/sysconfig/</filename>.  This directory should
     contain a file for each interface to be configured, such as
-    <filename>ifconfig.xyz</filename>, where <quote>xyz</quote> is is
+    <filename>ifconfig.xyz</filename>, where <quote>xyz</quote> is
     meaningful to the administrator such as the device name (e.g. eth0).
     Inside this file are attributes to this interface, such as its IP
     address(es), subnet masks, and so forth.  It is necessary that 
diff --git a/general.ent b/general.ent
index 49c1c2d92..dda198398 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110801">
-<!ENTITY releasedate "Aug 1, 2011">
+<!ENTITY version "SVN-20110802">
+<!ENTITY releasedate "Aug 2, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 41d89ee76..1195a1e06 100644
--- a/packages.ent
+++ b/packages.ent
@@ -297,7 +297,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20110801">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20110802">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->