msw/CISS.debian.installer
SHA256
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m41s
Details

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-07-09 10:51:49 +02:00
parent f383309d80
commit 0b95ad9700
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
func/1080_helper_chroot.sh
View File

@@ -25,13 +25,15 @@ guard_sourcing
# 0: Successfully executed commands. # 0: Successfully executed commands.
####################################### #######################################
do_in_target() { do_in_target() {
declare var_chroot_target="$1"; shift declare var_chroot_target="$1"
shift
declare -a ary_chroot_command=("$@") declare -a ary_chroot_command=("$@")
if chroot "${var_chroot_target}" /usr/bin/env -i \ if chroot "${var_chroot_target}" /usr/bin/env -i \
HOME=/root \ HOME=/root \
PATH=/usr/sbin:/usr/bin:/sbin:/bin \ PATH=/usr/sbin:/usr/bin:/sbin:/bin \
TERM="${TERM}" \ TERM="${TERM}" \
"${ary_chroot_command[@]}"; then "${ary_chroot_command[@]}"
then
do_log "info" "true" "Success: chroot ${var_chroot_target}: ${ary_chroot_command[*]}" do_log "info" "true" "Success: chroot ${var_chroot_target}: ${ary_chroot_command[*]}"
return 0 return 0
else else

32
func/4110_setup_locales.sh
View File

@@ -12,45 +12,51 @@
guard_sourcing guard_sourcing
########################################################################################### #######################################
# Set locale and configure keyboard layout # Set locale and configure keyboard layout.
# Globals: # Globals:
# MODULE_ERR
# MODULE_TXT
# TARGET # TARGET
# locale_country
# locale_keyboard_layout # locale_keyboard_layout
# locale_keyboard_xkb_keymap # locale_keyboard_xkb_keymap
# locale_language
# locale_locale # locale_locale
# Arguments: # Arguments:
# None # None
########################################################################################### # Returns:
# 0: Successfully executed commands.
#######################################
setup_locales() { setup_locales() {
do_in_target "${TARGET}" apt-get install -y locales do_in_target "${TARGET}" apt-get install -y locales
# TODO: Alternative elif statement to use separately configured variables '{$locale_country}' and '{$locale_language}'. ### Give priority to '${locale_locale}' over separately configured variables '{$locale_country}' and '{$locale_language}'.
# Give priority to '${locale_locale}' over separately configured variables '{$locale_country}' and '{$locale_language}'. ### If 'locale_locale' is not set, build it from 'locale_language' and 'locale_country'.
if [[ -n "${locale_language:-}" && -n "${locale_country:-}" && -z "${locale_locale}" ]]; then
locale_locale="${locale_language}_${locale_country}.UTF-8"
fi
if [[ -n "${locale_locale}" ]]; then if [[ -n "${locale_locale}" ]]; then
# Generate the specified locale ### Generate the specified locale
do_in_target "${TARGET}" locale-gen "${locale_locale}" do_in_target "${TARGET}" locale-gen "${locale_locale}"
do_log "info" "true" "Command: 'locale-gen ${locale_locale}' executed in: '${TARGET}'." do_log "info" "true" "Command: 'locale-gen ${locale_locale}' executed in: '${TARGET}'."
# Set the standard locale ### Set the standard locale
do_in_target "${TARGET}" update-locale LANG="${locale_locale}" LC_ALL="${locale_locale}" do_in_target "${TARGET}" update-locale LANG="${locale_locale}" LC_ALL="${locale_locale}"
do_log "info" "true" "Command: 'update-locale LANG=${locale_locale} LC_ALL=${locale_locale}' executed in: '${TARGET}'." do_log "info" "true" "Command: 'update-locale LANG=${locale_locale} LC_ALL=${locale_locale}' executed in: '${TARGET}'."
# Set the keyboard layout for the system (for consoles) ### Set the keyboard layout for the system (for consoles)
# shellcheck disable=SC2154 # "${locale_keyboard_layout}" # shellcheck disable=SC2154 # "${locale_keyboard_layout}"
sed -i "s/^KEYMAP=.*/KEYMAP=${locale_keyboard_layout}/" "${TARGET}"/etc/default/keyboard sed -i "s/^KEYMAP=.*/KEYMAP=${locale_keyboard_layout}/" "${TARGET}"/etc/default/keyboard
do_log "info" "false" "Keyboard layout updated: 'KEYMAP=${locale_keyboard_layout}' -> '${TARGET}/etc/default/keyboard'." do_log "info" "false" "Keyboard layout updated: 'KEYMAP=${locale_keyboard_layout}' -> '${TARGET}/etc/default/keyboard'."
# Set the X11 keyboard layout (for graphical environments) ### Set the X11 keyboard layout (for graphical environments)
# shellcheck disable=SC2154 # "${locale_keyboard_xkb_keymap}" # shellcheck disable=SC2154 # "${locale_keyboard_xkb_keymap}"
do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}" do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}"
do_log "info" "true" "Command: 'localectl set-x11-keymap ${locale_keyboard_xkb_keymap}' executed in: '${TARGET}'." do_log "info" "true" "Command: 'localectl set-x11-keymap ${locale_keyboard_xkb_keymap}' executed in: '${TARGET}'."
fi fi
do_show_footer "${MODULE_TXT}" return 0
} }
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh: # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh