Changeset d4c8dce4 for bootscripts/lfs/init.d/console

Timestamp:

09/15/2021 07:24:40 AM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

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, arm, bdubbs/gcc13, 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:

9af096e

Parents:

df1207e (diff), 06e7b361 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into plabs/condxml

File:

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

bootscripts/lfs/init.d/console

@@ -33 +33 @@
 [ -r /etc/sysconfig/console ] && . /etc/sysconfig/console
 
-is_true() 
+is_true()
 {
    [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ]
@@ -44 +44 @@
       # See if we need to do anything
       if [ -z "${KEYMAP}"         ] && [ -z "${KEYMAP_CORRECTIONS}" ] &&
-         [ -z "${FONT}"           ] && [ -z "${LEGACY_CHARSET}"     ] &&     
-         ! is_true "${UNICODE}"; then 
+         [ -z "${FONT}"           ] && [ -z "${LEGACY_CHARSET}"     ] &&
+         ! is_true "${UNICODE}"; then
          exit 0
       fi
@@ -86 +86 @@
          loadkeys ${KEYMAP} >/dev/null 2>&1 ||
          failed=1
-      
+
       [ -z "${KEYMAP_CORRECTIONS}" ] ||
          loadkeys ${KEYMAP_CORRECTIONS} >/dev/null 2>&1 ||
@@ -98 +98 @@
       # If any of the commands above failed, the trap at the
       # top would set $failed to 1
-      ( exit $failed ) 
+      ( exit $failed )
       evaluate_retval
 
       exit $failed
-      ;;              
+      ;;
 
-   *)                 
+   *)
       echo "Usage:  ${0} {start}"
-      exit 1          
-      ;;              
+      exit 1
+      ;;
 esac