Author: bdubbs
Date: 2011-08-02 10:28:02 -0600 (Tue, 02 Aug 2011)
New Revision: 9575
Modified:
trunk/BOOK/bootscripts/lfs/init.d/functions
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter06/creatingdirs.xml
trunk/BOOK/chapter07/network.xml
trunk/BOOK/general.ent
trunk/BOOK/packages.ent
Log:
Add /etc/sysconfig to Creating Directories
Update boot logging to remove terminal escape sequences
Modified: trunk/BOOK/bootscripts/lfs/init.d/functions
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/functions 2011-08-02 02:15:42 UTC (rev
9574)
+++ trunk/BOOK/bootscripts/lfs/init.d/functions 2011-08-02 16:28:02 UTC (rev
9575)
@@ -136,36 +136,36 @@
{
${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 @@
{
${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_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_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_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
}
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2011-08-02 02:15:42 UTC (rev 9574)
+++ trunk/BOOK/chapter01/changelog.xml 2011-08-02 16:28:02 UTC (rev 9575)
@@ -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>
Modified: trunk/BOOK/chapter06/creatingdirs.xml
===================================================================
--- trunk/BOOK/chapter06/creatingdirs.xml 2011-08-02 02:15:42 UTC (rev
9574)
+++ trunk/BOOK/chapter06/creatingdirs.xml 2011-08-02 16:28:02 UTC (rev
9575)
@@ -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
Modified: trunk/BOOK/chapter07/network.xml
===================================================================
--- trunk/BOOK/chapter07/network.xml 2011-08-02 02:15:42 UTC (rev 9574)
+++ trunk/BOOK/chapter07/network.xml 2011-08-02 16:28:02 UTC (rev 9575)
@@ -120,7 +120,7 @@
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
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2011-08-02 02:15:42 UTC (rev 9574)
+++ trunk/BOOK/general.ent 2011-08-02 16:28:02 UTC (rev 9575)
@@ -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
– -->
<!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2011-08-02 02:15:42 UTC (rev 9574)
+++ trunk/BOOK/packages.ent 2011-08-02 16:28:02 UTC (rev 9575)
@@ -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 -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
