From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 1 May 2025 04:21:15 +0000 (+0200)
Subject: Fix.
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/day?a=commitdiff_plain;h=bd4e905dfe2a09ddfce77deb4746d6290868e93b;p=config

Fix.
---

diff --git a/bookworm/scripts/lib/core_setup b/bookworm/scripts/lib/core_setup
index b9df306..5157cc4 100644
--- a/bookworm/scripts/lib/core_setup
+++ b/bookworm/scripts/lib/core_setup
@@ -1,8 +1,6 @@
-. lib/apt_get_edited
-. lib/constants_etc  # PATH_ETC
 . lib/constants_user  # USERNAME
 . lib/copy_dirtrees_of_tags
-. lib/ensure_packages_of_tags
+. lib/minimize_installation
 
 core_setup() {
     _HOSTNAME="$1"
@@ -10,27 +8,8 @@ core_setup() {
     _EXTERNAL_IP="$3"
     _INSTALL_TAGS="$4"
 
-    echo "# Installing and/or keeping only what's required by us or Debian."
+    minimize_installation ${_INSTALL_TAGS}
 
-    # mark non-requireds auto
-    _PATH_LIST_PREFIX=/tmp/list_
-    _PATH_LIST_UNSORTED="${_PATH_LIST_PREFIX}unsorted"
-    _PATH_LIST_ALL_PACKAGES="${_PATH_LIST_PREFIX}all_packages"
-    _PATH_LIST_WHITE="${_PATH_LIST_PREFIX}white"
-    _PATH_LIST_BLACK="${_PATH_LIST_PREFIX}black"
-    _TOK_REQ=' required'
-    dpkg-query -Wf '${Package} ${Priority}\n' | grep "${_TOK_REQ}" | cut -d' ' -f1 > "${_PATH_LIST_UNSORTED}"
-    sort "${_PATH_LIST_UNSORTED}" > "${_PATH_LIST_WHITE}"
-    dpkg-query -Wf '${Package}\n' > "${_PATH_LIST_UNSORTED}"
-    sort "${_PATH_LIST_UNSORTED}" > "${_PATH_LIST_ALL_PACKAGES}"
-    comm -3 "${_PATH_LIST_ALL_PACKAGES}" "${_PATH_LIST_WHITE}" > "${_PATH_LIST_BLACK}"
-    apt-mark auto `cat "${_PATH_LIST_BLACK}"` > /dev/null
-    rm "${_PATH_LIST_UNSORTED}" "${_PATH_LIST_ALL_PACKAGES}" "${_PATH_LIST_WHITE}" "${_PATH_LIST_BLACK}"
-
-    # before purging, ensure tagged packages installed
-    ensure_packages_of_tags ${_INSTALL_TAGS} 
-    echo '# Autoremove and purge …'
-    apt_get_edited '-q -q autopurge'
     echo '# And now: dist-upgrade …'
     apt_get_edited '-q -q dist-upgrade' 
 
diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags
index 3cb1e3a..f8ca1d0 100644
--- a/bookworm/scripts/lib/ensure_packages_of_tags
+++ b/bookworm/scripts/lib/ensure_packages_of_tags
@@ -14,7 +14,7 @@ ensure_packages_of_tags() {
             echo "nothing to install."
         else
             echo "ensuring installation of: ${_PACKAGES}"
-            apt_get_edited "-q -o Dpkg::Options::=--force-confnew install ${_PACKAGES}"
+            apt_get_edited "-q -q -o Dpkg::Options::=--force-confnew install ${_PACKAGES}"
         fi
     done
     echo ''
diff --git a/trixie/scripts/from_older_upgrade.sh b/trixie/scripts/from_older_upgrade.sh
index 63cb50a..5f1e9da 100755
--- a/trixie/scripts/from_older_upgrade.sh
+++ b/trixie/scripts/from_older_upgrade.sh
@@ -3,26 +3,29 @@ set -e
 cd $(dirname "$0")
 . lib/apt_get_edited
 . lib/constants_etc  # PATH_ETC
+. lib/minimize_system
+
+minimize_installation all_old server_basic_old
 
 PATH_ETC_APT="${PATH_ETC}/apt"
 PATH_ETC_APT_CONF=${PATH_ETC_APT}/apt.conf.d
 PATH_COPY_TAG='../copy/all'
 
-# to reduce clutter
-apt-get -y autoremove apt-listchanges > /dev/null
-
-# apt_get_edited needs this
-apt-get -q -q -y install calc > /dev/null
-
 apt_update_to_full_upgrade() {
     echo '# Updating package database …'
     apt_get_edited '-q -q update'
+    echo '# Autopurge!'
+    apt_get_edited '-q -q autopurge'
 
     echo '# Soft-upgrading …'
-    apt_get_edited '-q -q -o Dpkg::Options::=--force-confnew upgrade'
+    apt_get_edited '-q -q --purge -o Dpkg::Options::=--force-confnew upgrade'
+    echo '# Autopurge!'
+    apt_get_edited '-q -q autopurge'
 
     echo '# Full-upgrading …'
-    apt_get_edited '-q -q -o Dpkg::Options::=--force-confnew full-upgrade'
+    apt_get_edited '-q -q --purge -o Dpkg::Options::=--force-confnew full-upgrade'
+    echo '# Autopurge!'
+    apt_get_edited '-q -q autopurge'
 }
 
 PATH_CONF_MIN_DEPS="${PATH_COPY_TAG}${PATH_ETC_APT_CONF}/99_minimize_dependencies"
@@ -37,5 +40,5 @@ cp "${PATH_CONF_SOURCES}" "${PATH_ETC_APT}/"
 
 apt_update_to_full_upgrade
 
-echo '# Purging …'
+echo '# Autopurge!'
 apt_get_edited  '-q -q autopurge'