diff options
| author | Joshua Bussdieker <[email protected]> | 2019-08-14 03:26:55 -0700 |
|---|---|---|
| committer | XECDesign <[email protected]> | 2019-08-14 11:26:55 +0100 |
| commit | d1f7a389055eae207009dd1a19d971d4b873b73e (patch) | |
| tree | d8e043f6b6a1515af9e892796f8ccf28e20564b9 /stage2 | |
| parent | 8110eb48916b1ee39c1e4eed6783a5a142814ffd (diff) | |
Support regional config settings (#323)
Diffstat (limited to 'stage2')
| -rw-r--r-- | stage2/01-sys-tweaks/00-debconf | 4 | ||||
| -rwxr-xr-x | stage2/03-set-timezone/02-run.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf index 96aa9b0..c13e3b1 100644 --- a/stage2/01-sys-tweaks/00-debconf +++ b/stage2/01-sys-tweaks/00-debconf @@ -15,7 +15,7 @@ keyboard-configuration keyboard-configuration/altgr select The default for the k keyboard-configuration keyboard-configuration/model select Generic 105-key (Intl) PC # Keymap to use: # Choices: American English, Albanian, Arabic, Asturian, Bangladesh, Belarusian, Bengali, Belgian, Bosnian, Brazilian, British English, Bulgarian, Bulgarian (phonetic layout), Burmese, Canadian French, Canadian Multilingual, Catalan, Chinese, Croatian, Czech, Danish, Dutch, Dvorak, Dzongkha, Esperanto, Estonian, Ethiopian, Finnish, French, Georgian, German, Greek, Gujarati, Gurmukhi, Hebrew, Hindi, Hungarian, Icelandic, Irish, Italian, Japanese, Kannada, Kazakh, Khmer, Kirghiz, Korean, Kurdish (F layout), Kurdish (Q layout), Lao, Latin American, Latvian, Lithuanian, Macedonian, Malayalam, Nepali, Northern Sami, Norwegian, Persian, Philippines, Polish, Portuguese, Punjabi, Romanian, Russian, Serbian (Cyrillic), Sindhi, Sinhala, Slovak, Slovenian, Spanish, Swedish, Swiss French, Swiss German, Tajik, Tamil, Telugu, Thai, Tibetan, Turkish (F layout), Turkish (Q layout), Ukrainian, Uyghur, Vietnamese -keyboard-configuration keyboard-configuration/xkb-keymap select gb +keyboard-configuration keyboard-configuration/xkb-keymap select ${KEYBOARD_KEYMAP} # Compose key: # Choices: No compose key, Right Alt (AltGr), Right Control, Right Logo key, Menu key, Left Logo key, Caps Lock keyboard-configuration keyboard-configuration/compose select No compose key @@ -23,4 +23,4 @@ keyboard-configuration keyboard-configuration/compose select No compose key keyboard-configuration keyboard-configuration/ctrl_alt_bksp boolean true # Keyboard layout: # Choices: English (UK), English (UK) - English (UK\, Colemak), English (UK) - English (UK\, Dvorak with UK punctuation), English (UK) - English (UK\, Dvorak), English (UK) - English (UK\, Macintosh international), English (UK) - English (UK\, Macintosh), English (UK) - English (UK\, extended WinKeys), English (UK) - English (UK\, international with dead keys), Other -keyboard-configuration keyboard-configuration/variant select English (UK) +keyboard-configuration keyboard-configuration/variant select ${KEYBOARD_LAYOUT} diff --git a/stage2/03-set-timezone/02-run.sh b/stage2/03-set-timezone/02-run.sh index 67cbfd3..96b22c7 100755 --- a/stage2/03-set-timezone/02-run.sh +++ b/stage2/03-set-timezone/02-run.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -echo "Europe/London" > "${ROOTFS_DIR}/etc/timezone" +echo "${TIMEZONE_DEFAULT}" > "${ROOTFS_DIR}/etc/timezone" rm "${ROOTFS_DIR}/etc/localtime" on_chroot << EOF |