V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

.preseed/preseed.yaml

@@ -84,7 +84,7 @@ debootstrap:                   # Provide a mirror for downloading the Debian pac
                                # list of official Debian packages.
   mirror: "https://deb.debian.org/debian"
                                # The following packages MUST be included in the debootstrap.
-  includes: "busybox,ca-certificates,locales,openssl,zstd"
+  includes: "busybox,ca-certificates,locales,openssl,python3,python3-apt,zstd"
 distribution: "trixie"         # MUST be "trixie".
 debian_suite: "stable"         # MUST be "stable". Not supported yet: "testing", "experimental".
 exit:
@@ -579,6 +579,8 @@ software:
   # openssl
   # passwd
   # procps
+  # python3
+  # python3-apt
   # sed
   # tar
   # tzdata
@@ -751,7 +753,6 @@ software:
   - figlet
   - htop
   - keychain
-  - python3
   - virt-what
 
 ################################################################################################################################

func/cdi_4100_base/4100_generate_sources.sh

@@ -162,7 +162,25 @@ EOF
 
   cat << EOF >> "${TARGET}/etc/apt/sources.list"
 
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf
+EOF
+
+
+  insert_header   "${TARGET}/etc/apt/apt.conf.d/90-no-pdiffs"
+  insert_comments "${TARGET}/etc/apt/apt.conf.d/90-no-pdiffs"
+  cat << 'EOF' >> "${TARGET}/etc/apt/apt.conf.d/90-no-pdiffs"
+Acquire::PDiffs "false";
+
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf
+EOF
+
+
+  insert_header   "${TARGET}/etc/apt/apt.conf.d/91-acquire"
+  insert_comments "${TARGET}/etc/apt/apt.conf.d/91-acquire"
+  cat << 'EOF' >> "${TARGET}/etc/apt/apt.conf.d/91-acquire"
+Acquire::Retries "3";
+
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf
 EOF
 
   guard_dir && return 0

func/cdi_4100_base/4105_generate_sources_822.sh

@@ -155,10 +155,29 @@ EOF
 
   fi
 
+
   if [[ -f "${TARGET}/etc/apt/sources.list" ]]; then
     rm -f "${TARGET}/etc/apt/sources.list"
   fi
 
+
+  insert_header   "${TARGET}/etc/apt/apt.conf.d/90-no-pdiffs"
+  insert_comments "${TARGET}/etc/apt/apt.conf.d/90-no-pdiffs"
+  cat << 'EOF' >> "${TARGET}/etc/apt/apt.conf.d/90-no-pdiffs"
+Acquire::PDiffs "false";
+
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf
+EOF
+
+
+  insert_header   "${TARGET}/etc/apt/apt.conf.d/91-acquire"
+  insert_comments "${TARGET}/etc/apt/apt.conf.d/91-acquire"
+  cat << 'EOF' >> "${TARGET}/etc/apt/apt.conf.d/91-acquire"
+Acquire::Retries "3";
+
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf
+EOF
+
   guard_dir && return 0
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

lib/cdi_0030_checks/0030_check_pkgs.sh

@@ -67,7 +67,7 @@ check_pkgs() {
 
   ### Installing unique list of packages.
   # shellcheck disable=SC2312
-  apt-get update 2>&1 | tee -a "${DIR_LOG}/0030_check_pkgs.log"
+  apt-get -o Acquire::PDiffs=false update 2>&1 | tee -a "${DIR_LOG}/0030_check_pkgs.log"
   if ((${#ary_missing_pkgs[@]})); then
 
     # shellcheck disable=SC2312