diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-08-24 03:23:34 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-08-24 03:23:34 +0000 |
| commit | d163adadb9e30d1f68e73c6636c4e7b21847af3b (patch) | |
| tree | 7e58721bbc69a58c5ed666fecdeaf9e127853dcf | |
| parent | 0a50cc245b4346da6e16701e16f11878598c2923 (diff) | |
Read /etc/sysconfig/console when needed in rc
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9960 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | bootscripts/ChangeLog | 3 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/rc | 7 | ||||
| -rw-r--r-- | packages.ent | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index a9ee10ef6..b409e073d 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,6 @@ +2012-08-24 Bruce Dubbs <bdubbs@linuxfromscratch.org> + * Read /etc/sysconfig/console when needed in rc + 2012-06-17 Bruce Dubbs <bdubbs@linuxfromscratch.org> * Only mount /run in mountvirtfs if it is not already mounted (from an initrd). diff --git a/bootscripts/lfs/init.d/rc b/bootscripts/lfs/init.d/rc index f10d22dd4..009442f1f 100644 --- a/bootscripts/lfs/init.d/rc +++ b/bootscripts/lfs/init.d/rc @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ######################################################################## # Begin rc # @@ -110,7 +110,10 @@ fi if [ "$runlevel" == "6" -o "$runlevel" == "0" ]; then IPROMPT="no"; fi # Note: In ${LOGLEVEL:-7}, it is ':' 'dash' '7', not minus 7 -if [ "$runlevel" == "S" ]; then dmesg -n "${LOGLEVEL:-7}"; fi +if [ "$runlevel" == "S" ]; then + [ -r /etc/sysconfig/console ] && source /etc/sysconfig/console + dmesg -n "${LOGLEVEL:-7}" +fi if [ "${IPROMPT}" == "yes" -a "${runlevel}" == "S" ]; then # The total length of the distro welcome string, without escape codes diff --git a/packages.ent b/packages.ent index 9b7bc0775..4c1a66595 100644 --- a/packages.ent +++ b/packages.ent @@ -302,7 +302,7 @@ <!ENTITY less-ch6-du "3.8 MB"> <!ENTITY less-ch6-sbu "less than 0.1 SBU"> -<!ENTITY lfs-bootscripts-version "20120725"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20120823"> <!-- 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 --> |