Changeset 30732c6a

Timestamp:

08/31/2019 12:47:22 PM (5 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

974fe35

Parents:

0a0b609

Message:

Process layout replaceable

Location:

BLFS

Files:

• gen_pkg_book.sh (modified) (4 diffs)
• xsl/gen_config.xsl (modified) (1 diff)
• xsl/process-replaceable.xsl (modified) (2 diffs)

BLFS/gen_pkg_book.sh

@@ -32 +32 @@
 declare SUDO
 declare LANGUAGE
+declare KBLAYOUT
 declare WRAP_INSTALL
 declare DEL_LA_FILES
@@ -57 +58 @@
       STATS=*         | \
       LANGUAGE=*      | \
+      KBLAYOUT=*      | \
       SUDO=*  )  eval ${REPLY} # Define/set a global variable..
                       continue ;;
@@ -84 +86 @@
 #--------------------------#
   local -r dotSTR=".................."
-  local -r PARAM_LIST="DEP_LEVEL SUDO LANGUAGE MAIL_SERVER WRAP_INSTALL DEL_LA_FILES STATS"
+  local -r PARAM_LIST="DEP_LEVEL SUDO LANGUAGE KBLAYOUT MAIL_SERVER WRAP_INSTALL DEL_LA_FILES STATS"
   local -r PARAM_VALS='${config_param}${dotSTR:${#config_param}} ${L_arrow}${BOLD}${!config_param}${OFF}${R_arrow}'
   local config_param
@@ -217 +219 @@
          --stringparam list-stat "$LIST_STAT" \
          --stringparam language "$LANGUAGE" \
+         --stringparam xkblayout "$KBLAYOUT" \
          --stringparam fqdn "$(hostname -f)" \
          -o ./scripts/ ${MakeScripts} \

BLFS/xsl/gen_config.xsl

@@ -63 +63 @@
             mandatory. The @modfier is honoured if present.
 
+config  KBLAYOUT
+        string "Keyboard layout (to be used in GDM)"
+        default "us"
+        help
+            Used in GDM for setting the login screen keyboard layout.
+            See the GDM page in the book for what to put into this field
+
 config  SUDO
         bool "Build as User"

BLFS/xsl/process-replaceable.xsl

@@ -55 +55 @@
 
 <!--===================================================================-->
+<!-- keyboard layout for the gdm page (as of BLFS 9.0) -->
+  <xsl:param name="xkblayout" select="'us'"/>
+
+<!--===================================================================-->
 <!-- the main template: to be adjusted depending on the book -->
   <xsl:template match="replaceable">
@@ -85 +89 @@
       <xsl:when test="contains(string(),'@modifier')">
         <xsl:copy-of select="$lang-modifier"/>
+      </xsl:when>
+<!-- keyboard layout for X/waylang (only GDM as of BLFS-9.0) -->
+      <xsl:when test="contains(string(),'layout')">
+        <xsl:copy-of select="$xkblayout"/>
       </xsl:when>
 <!-- At several places, the number of jobs is given as "N" in a replaceable