Author: pierre Date: Sat Aug 31 05:47:22 2019 New Revision: 4119 Log: Process layout replaceable
Modified: jhalfs/trunk/BLFS/gen_pkg_book.sh jhalfs/trunk/BLFS/xsl/gen_config.xsl jhalfs/trunk/BLFS/xsl/process-replaceable.xsl Modified: jhalfs/trunk/BLFS/gen_pkg_book.sh ============================================================================== --- jhalfs/trunk/BLFS/gen_pkg_book.sh Sat Aug 17 01:30:36 2019 (r4118) +++ jhalfs/trunk/BLFS/gen_pkg_book.sh Sat Aug 31 05:47:22 2019 (r4119) @@ -31,6 +31,7 @@ declare DEP_LEVEL declare SUDO declare LANGUAGE +declare KBLAYOUT declare WRAP_INSTALL declare DEL_LA_FILES declare STATS @@ -56,6 +57,7 @@ DEL_LA_FILES=* | \ STATS=* | \ LANGUAGE=* | \ + KBLAYOUT=* | \ SUDO=* ) eval ${REPLY} # Define/set a global variable.. continue ;; esac @@ -83,7 +85,7 @@ validate_configuration() { # #--------------------------# 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 local -i index @@ -216,6 +218,7 @@ --stringparam del-la-files "$DEL_LA_FILES" \ --stringparam list-stat "$LIST_STAT" \ --stringparam language "$LANGUAGE" \ + --stringparam xkblayout "$KBLAYOUT" \ --stringparam fqdn "$(hostname -f)" \ -o ./scripts/ ${MakeScripts} \ ${BookXml} Modified: jhalfs/trunk/BLFS/xsl/gen_config.xsl ============================================================================== --- jhalfs/trunk/BLFS/xsl/gen_config.xsl Sat Aug 17 01:30:36 2019 (r4118) +++ jhalfs/trunk/BLFS/xsl/gen_config.xsl Sat Aug 31 05:47:22 2019 (r4119) @@ -62,6 +62,13 @@ Because of the book layout, the 3 fields, ll, CC and charmap are 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" default y Modified: jhalfs/trunk/BLFS/xsl/process-replaceable.xsl ============================================================================== --- jhalfs/trunk/BLFS/xsl/process-replaceable.xsl Sat Aug 17 01:30:36 2019 (r4118) +++ jhalfs/trunk/BLFS/xsl/process-replaceable.xsl Sat Aug 31 05:47:22 2019 (r4119) @@ -54,6 +54,10 @@ <!-- end of host/domain name variables --> <!--===================================================================--> +<!-- 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"> <xsl:choose> @@ -85,6 +89,10 @@ <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 tag. We either detect "N" alone or <N> Replace N with 4. --> <xsl:when test="contains(string(),'<N>') or string()='N'"> -- http://lists.linuxfromscratch.org/listinfo/alfs-log Unsubscribe: See the above information page