From: Christian Heller Date: Thu, 17 Apr 2025 21:35:37 +0000 (+0200) Subject: Fix. X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/%7B%7Bprefix%7D%7D?a=commitdiff_plain;h=1e0d9fbaf9a1b7fdef73037b5aee9ed6ea9173d8;p=config Fix. --- diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh index 8b4272f..e4f1c49 100755 --- 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