From dbf682bc5a8046be5926a93a2b3ab6536eacdc53 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Mon, 31 Mar 2025 11:04:47 +0200 Subject: [PATCH] Fixes. --- testing/scripts/setup_desktop.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh index b428c42..398de31 100755 --- a/testing/scripts/setup_desktop.sh +++ b/testing/scripts/setup_desktop.sh @@ -18,6 +18,7 @@ PATH_NETWORK_INTERFACES="${PATH_ETC}/network/interfaces" PATH_REL_APT=apt PATH_REL_APT_CONF=${PATH_REL_APT}/apt.conf.d TAG_ALL=all +MIN_TAGS="${TAG_ALL} desktop" THINKPAD_NAMES="x220 w530 t490s" get_system_class_for() { @@ -75,7 +76,8 @@ abort_if_offline SYSTEM_NAME="$1" abort_if_illegal_system_name "${SYSTEM_NAME}" SYSTEM_CLASS_NAME="$(get_system_class_for ${SYSTEM_NAME})" -MIN_TAGS="${TAG_ALL} ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME} desktop" +MIN_TAGS="${MIN_TAGS} ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME}" +MAX_TAGS="${MIN_TAGS} user" export DEBIAN_FRONTEND=noninteractive @@ -84,7 +86,7 @@ echo "\nUpgrading to testing." cp "${PATH_CONF_ETC}/${TAG_ALL}/${PATH_REL_APT_CONF}/99_minimize_dependencies" "${PATH_ETC}/${PATH_REL_APT_CONF}/" upgrade_from_older_release -init_packages "${MIN_TAGS}" +init_packages "${MAX_TAGS}" # NB: This needs to come before steps potentially overwriting /etc/network/interfaces. echo "\nChecking for existing wifi config in ${PATH_NETWORK_INTERFACES}." @@ -97,7 +99,7 @@ echo "127.0.0.1 localhost.localdomain localhost" > /etc/hosts echo "$(determine_ip) ${SYSTEM_NAME}" >> /etc/hosts echo "\nAdapting /etc to our needs." -copy_dirtree "${PATH_CONF_ETC}" '/etc' ${MIN_TAGS} user +copy_dirtree "${PATH_CONF_ETC}" '/etc' ${MAX_TAGS} # echo "\nEnsuring our desired locale is available." # locale-gen -- 2.30.2