diff options
-rw-r--r-- | languages | 1 | ||||
-rwxr-xr-x | make_slackware_live.sh | 17 |
2 files changed, 13 insertions, 5 deletions
@@ -5,6 +5,7 @@ da:dansk:dk-latin1:Europe/Copenhagen:da_DK.utf8: gb:british:uk:Etc/GMT:en_GB.utf8: de:deutsch:de-latin1-nodeadkeys:Europe/Berlin:de_DE@euro:de,nodeadkeys de_ch:deutsch (schweiz):de-latin1:Europe/Zurich:de_CH.utf8:ch, +en:english:us:UTC:en_US.utf8: es:espanol:es:Europe/Madrid:es_ES.utf8: fr:francais:fr-latin9:Europe/Paris:fr_FR.utf8: fr_ch:francais (suisse):fr-latin9:Europe/Zurich:fr_CH.utf8:ch,fr diff --git a/make_slackware_live.sh b/make_slackware_live.sh index c651745..d59d495 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -240,9 +240,9 @@ KAPPEND_STUDIOWARE="threadirqs" # Add CACert root certificates yes/no? ADD_CACERT=${ADD_CACERT:-"NO"} -# Default language selection for the Live OS; this can be changed with the -# coomandline switch "-l": -DEF_LANG="us" +# Default language selection for the Live OS; 'en' means generic English. +# This can be changed with the commandline switch "-l": +DEF_LANG="en" # # --------------------------------------------------------------------------- @@ -649,12 +649,13 @@ function gen_bootmenu() { rm -f ${MENUROOTDIR}/kbd.cfg rm -f ${MENUROOTDIR}/lang*.cfg - # Generate main (US) vesamenu.cfg: + # Generate main (EN) vesamenu.cfg: cat ${LIVE_TOOLDIR}/menu.tpl | sed \ -e "s/@KBD@/${DEF_KBD}/g" \ -e "s/@LANG@/${DEF_LANG}/g" \ -e "s/@ULANG@/${DEF_LANG^^}/g" \ -e "s,@LOCALE@,${DEF_LOCALE},g" \ + -e "s,@TZ@,${DEF_TZ},g" \ -e "s/@CONSFONT@/$CONSFONT/g" \ -e "s/@DIRSUFFIX@/$DIRSUFFIX/g" \ -e "s/@DISTRO@/$DISTRO/g" \ @@ -681,6 +682,11 @@ function gen_bootmenu() { cat <<EOL >> ${MENUROOTDIR}/kbd.cfg label ${LANCOD} menu label ${LANDSC} +EOL + if [ "${KBD}" == "${DEF_KBD}" ]; then + echo " menu default" >> ${MENUROOTDIR}/kbd.cfg + fi + cat <<EOL >> ${MENUROOTDIR}/kbd.cfg kbdmap menu/${KBD}.ktl kernel vesamenu.c32 append menu/menu_${LANCOD}.cfg @@ -693,6 +699,7 @@ EOL -e "s/@LANG@/$LANCOD/g" \ -e "s/@ULANG@/${DEF_LANG^^}/g" \ -e "s,@LOCALE@,${DEF_LOCALE},g" \ + -e "s,@TZ@,${DEF_TZ},g" \ -e "s/@CONSFONT@/$CONSFONT/g" \ -e "s/@DIRSUFFIX@/$DIRSUFFIX/g" \ -e "s/@DISTRO@/$DISTRO/g" \ @@ -1179,7 +1186,7 @@ else # Select sane defaults in case the language file lacks info: DEF_LANDSC="${DEF_LANDSC:-'us american'}" DEF_KBD="${DEF_KBD:-'us'}" - DEF_TZ="${DEF_TZ:-'US/Pacific'}" + DEF_TZ="${DEF_TZ:-'UTC'}" DEF_LOCALE="${DEF_LOCALE:-'en_US.utf8'}" fi |