From 4fe2835ff9cd0e4644cc8b9f20438286bf974501 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Thu, 13 Mar 2025 17:12:05 +0100 Subject: [PATCH] Fix order of setup steps. --- testing/scripts/setup_desktop.sh | 35 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh index c4d8ee4..c1ea384 100755 --- a/testing/scripts/setup_desktop.sh +++ b/testing/scripts/setup_desktop.sh @@ -65,24 +65,8 @@ for root in $ROOTS_HERE_AND_MANY; do done apt -y --purge autoremove -echo "Adapting /etc to our needs." -for root in $ROOTS_HERE_AND_MANY; do - copy_dirtree "${root}/${PATH_REL_ETC}" '/etc' ${MIN_MODULES} user desktop -done - -echo "Ensuring our desired locale is available." -locale-gen - -echo "Setting Berlin localtime." -ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime -ntpdate-debian - -echo "Setting up root user's home directory." -for root in $ROOTS_HERE_AND_MANY; do - copy_dirtree "${root}/${PATH_REL_HOME}" '/root' ${MIN_MODULES} minimal root -done - echo "Checking for existing wifi config in ${PATH_NETWORK_INTERFACES}." +# NB: This needs to come before steps potentially overwriting /etc/network/interfaces. PATH_NETWORK_INTERFACES=/etc/network/interfaces get_network_interfaces_last_wpa_value() { REGEX="^\s+wpa-${1}\s+" @@ -99,6 +83,23 @@ if [ ! -z "${WLAN_SSID}" ]; then fi fi +echo "Adapting /etc to our needs." +for root in $ROOTS_HERE_AND_MANY; do + copy_dirtree "${root}/${PATH_REL_ETC}" '/etc' ${MIN_MODULES} user desktop +done + +echo "Ensuring our desired locale is available." +locale-gen + +echo "Setting Berlin localtime." +ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime +ntpdate-debian + +echo "Setting up root user's home directory." +for root in $ROOTS_HERE_AND_MANY; do + copy_dirtree "${root}/${PATH_REL_HOME}" '/root' ${MIN_MODULES} minimal root +done + echo "Setting up user ${USERNAME}." adduser --disabled-password --gecos "" "${USERNAME}" usermod -a -G sudo "${USERNAME}" -- 2.30.2