From 497e2708e7ba802233b1c2c49d4ba86b49f51d53 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 6 May 2025 08:20:11 +0200 Subject: [PATCH] Fix. --- testing/scripts/minimize_installation.sh | 1 + testing/scripts/setup_desktop.sh | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 120000 testing/scripts/minimize_installation.sh diff --git a/testing/scripts/minimize_installation.sh b/testing/scripts/minimize_installation.sh new file mode 120000 index 0000000..b6c6482 --- /dev/null +++ b/testing/scripts/minimize_installation.sh @@ -0,0 +1 @@ +../../trixie/scripts/minimize_installation.sh \ No newline at end of file diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh index c5f21be..01c649c 100755 --- a/testing/scripts/setup_desktop.sh +++ b/testing/scripts/setup_desktop.sh @@ -8,8 +8,11 @@ cd $(dirname "$0") . lib/copy_dirtrees_of_tags . lib/core_setup . lib/expect_n_args +. lib/prefixed_msg . lib/put_finished_marker +prefixed_msg_init + PATH_NETWORK_INTERFACES="${PATH_ETC}/network/interfaces" THINKPAD_NAMES="x220 w530 t490s" @@ -48,7 +51,7 @@ adopt_wifi_connection() { WLAN_SSID=$(get_network_interfaces_last_wpa_value 'ssid') WLAN_PSK=$(get_network_interfaces_last_wpa_value 'psk') if [ ! -z "${WLAN_SSID}" ]; then - echo "Found, adding to NetworkManager." + prefixed_msg "Found, adding to NetworkManager." if [ -z "${WLAN_PSK}" ]; then nmcli connection add type wifi wifi.ssid "${WLAN_SSID}" else # NB: assumes last (collected with tail -1) wpa-psk that of last wlan-ssid @@ -63,19 +66,20 @@ adopt_wifi_connection() { # NB: This needs to come before steps potentially overwriting /etc/network/interfaces. apt-get -y install network-manager > /dev/null if [ "$(nmcli -f TYPE conn | grep 'wifi' | wc -l)" = "0" ]; then - echo "\n# Checking for existing wifi config in ${PATH_NETWORK_INTERFACES} …" + prefixed_msg "Checking for existing wifi config in ${PATH_NETWORK_INTERFACES} …" adopt_wifi_connection else - echo "\n# Already know wifi connection, nothing to add …" + prefixed_msg 'Already know wifi connection, nothing to add …' fi core_setup "${SYSTEM_NAME}" "" "" "${INSTALL_TAGS}" -echo '\n# Ensuring our desired locale is available …' +prefixed_msg 'Ensuring our desired locale is available …' locale-gen -echo '\n# Final user setup …' +prefixed_msg 'Final user setup …' adduser --quiet "${USERNAME}" plugdev # so user may use pmount echo "${USERNAME}:${USER_PW}" | chpasswd put_finished_marker 'setup_desktop' +prefixed_msg_exit -- 2.30.2