diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2011-09-22 15:13:58 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2011-09-22 15:13:58 +0000 |
| commit | 620c6d09e7d7154c1b6380adbdb00847175a2727 (patch) | |
| tree | 7b71da2aa5577faf279c85ebef455ad5b29cc0ad /bootscripts | |
| parent | ddfba10adbaae531d16b110ee713d1bbb4632657 (diff) | |
Fixes to console script
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9601 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/lfs/init.d/console | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootscripts/lfs/init.d/console b/bootscripts/lfs/init.d/console index f3b3a51e3..8740bec4f 100644 --- a/bootscripts/lfs/init.d/console +++ b/bootscripts/lfs/init.d/console @@ -39,8 +39,8 @@ function is_true() # 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 @@ -80,7 +80,7 @@ case "${1}" in done # 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}" ] || loadkeys ${KEYMAP} >/dev/null 2>&1 || |