Fix.

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index 8b4272f410eea8041efd5dd5b4d9252ca0ef5bc7..e4f1c49864212063dab27abab3fc7fc39bc53716 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -42,9 +42,7 @@ SYSTEM_NAME="$1"
 abort_if_illegal_system_name "${SYSTEM_NAME}"
 SYSTEM_CLASS_NAME="$(get_system_class_for ${SYSTEM_NAME})"
 TAG_ALL=all
-MIN_TAGS="${TAG_ALL} ${SYSTEM_CLASS_NAME}"
-TAGS_USER="user desktop ${SYSTEM_NAME}"
-TAGS_PACKAGES="${MIN_TAGS} ${TAGS_USER}"
+INSTALL_TAGS="${TAG_ALL} ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME} user desktop"
 PATH_COPY_TAG_ALL="../copy/${TAG_ALL}"
 
 upgrade_from_older_release() {
@@ -84,7 +82,7 @@ echo "\nUpgrading to testing."
 cp "${PATH_COPY_TAG_ALL}${PATH_ETC_APT_CONF}/99_minimize_dependencies" "${PATH_ETC_APT_CONF}/"
 upgrade_from_older_release
 
-init_packages "${TAGS_PACKAGES}"
+init_packages "${INSTALL_TAGS}"
 
 # NB: This needs to come before steps potentially overwriting /etc/network/interfaces.
 if [ "$(nmcli -f TYPE conn | grep 'wifi' | wc -l)" = "0" ]; then