diff options
| -rw-r--r-- | bootscripts/lfs/init.d/cleanfs | 2 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/console | 16 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 9 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 4 |
5 files changed, 22 insertions, 13 deletions
diff --git a/bootscripts/lfs/init.d/cleanfs b/bootscripts/lfs/init.d/cleanfs index 84485f1c0..25a21bcf4 100644 --- a/bootscripts/lfs/init.d/cleanfs +++ b/bootscripts/lfs/init.d/cleanfs @@ -22,7 +22,7 @@ # Default-Stop: # Short-Description: Cleans temporary directories early in the boot process. # Description: Cleans temporary directories /var/run, /var/lock, and -# optionally) /tmp. cleanfs also creates /var/run/utmp +# optionally, /tmp. cleanfs also creates /var/run/utmp # and any files defined in /etc/sysconfig/createfiles. # X-LFS-Provided-By: LFS ### END INIT INFO diff --git a/bootscripts/lfs/init.d/console b/bootscripts/lfs/init.d/console index 8476290d5..17a59e8a3 100644 --- a/bootscripts/lfs/init.d/console +++ b/bootscripts/lfs/init.d/console @@ -37,17 +37,17 @@ function is_true() [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ] } -# See if we need to do anything -if [ -z "${KEYMAP}" ] && [ -z "${KEYMAP_CORRECTIONS}" ] && - [ -z "${FONT}" ] && [ -z "${LEGACY_CHARSET}" ] && - ! is_true "${UNICODE}"; then - exit 0 -fi - failed=0 case "${1}" in start) + # See if we need to do anything + if [ -z "${KEYMAP}" ] && [ -z "${KEYMAP_CORRECTIONS}" ] && + [ -z "${FONT}" ] && [ -z "${LEGACY_CHARSET}" ] && + ! is_true "${UNICODE}"; then + exit 0 + fi + # There should be no bogus failures below this line! log_info_msg "Setting up Linux console..." @@ -104,7 +104,7 @@ case "${1}" in ;; *) - echo $"Usage:" "${0} {start}" + echo "Usage: ${0} {start}" exit 1 ;; esac diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7453f6240..4018d128e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,15 @@ --> <listitem> + <para>2011-11-26</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Clean up console script.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2011-11-25</para> <itemizedlist> <listitem> diff --git a/general.ent b/general.ent index d0763a5d7..648cf46ff 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20111125"> -<!ENTITY releasedate "Nov 25, 2011"> +<!ENTITY version "SVN-20111126"> +<!ENTITY releasedate "Nov 26, 2011"> <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.1"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index e1ce041dd..1a055ffe9 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 "20111114"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20111126"> <!-- 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 --> @@ -368,7 +368,7 @@ <!ENTITY man-pages-version "3.35"> <!ENTITY man-pages-size "1,650 KB"> -<!ENTITY man-pages-url "http://man7.org/linux/man-pages/download/man-pages-&man-pages-version;.tar.gz"> +<!ENTITY man-pages-url "http://man7.org/linux/download/man-pages/man-pages-&man-pages-version;.tar.gz"> <!ENTITY man-pages-md5 "e41432ee35a49036bbaf8d4598506e9c"> <!ENTITY man-pages-home "http://man7.org/linux/man-pages/index.html"> <!ENTITY man-pages-ch6-du "21 MB"> |