Fix order of setup steps.

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index c4d8ee405d635e0865b7f1fc7a95796cff03c7e3..c1ea38429880d7b1d62be8ceb36b52b3e25a2605 100755 (executable)
--- 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}"