Changeset 620c6d0 for bootscripts/lfs

Timestamp:

09/22/2011 03:13:58 PM (13 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

240ff15

Parents:

ddfba10

Message:

Fixes to console script

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

File:

• bootscripts/lfs/init.d/console (modified) (2 diffs)

bootscripts/lfs/init.d/console

@@ -40 +40 @@
 # See if we need to do anything
 if [ -z "${KEYMAP}"         ] && [ -z "${KEYMAP_CORRECTIONS}" ] &&
-   [ -z "${FONT}"           ] && [ is_true "${UNICODE}"       ] &&
-   [ -z "${LEGACY_CHARSET}" ]; then 
+   [ -z "${FONT}"           ] && [ -z "${LEGACY_CHARSET}"     ] &&     
+    is_true "${UNICODE}"; then 
    exit 0
 fi
@@ -81 +81 @@
 
       # Set the font (if not already set above) and the keymap
-      [ "${use_fb}" == "1" || [ -z "${FONT}" ] || setfont $FONT || failed=1
+      [ "${use_fb}" == "1" ] || [ -z "${FONT}" ] || setfont $FONT || failed=1
 
       [ -z "${KEYMAP}" ] ||