Explorar el Código

Read /etc/sysconfig/console when needed in rc

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9960 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs hace 12 años
padre
commit
d163adadb9
Se han modificado 3 ficheros con 9 adiciones y 3 borrados
  1. 3 0
      bootscripts/ChangeLog
  2. 5 2
      bootscripts/lfs/init.d/rc
  3. 1 1
      packages.ent

+ 3 - 0
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).

+ 5 - 2
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

+ 1 - 1
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 -->