Fix.

diff --git a/trixie/scripts/from_older_upgrade.sh b/trixie/scripts/from_older_upgrade.sh
index 404eb55f4453acfd914541a5559fa51252927df8..805260e05892957ccb0a4c16fc0a97c566d7f33f 100755 (executable)
--- a/trixie/scripts/from_older_upgrade.sh
+++ b/trixie/scripts/from_older_upgrade.sh
@@ -46,14 +46,14 @@ prefixed_msg "Copying over ${PATH_CONF_MIN_DEPS} …"
 cp "${PATH_CONF_MIN_DEPS}" "${PATH_ETC_APT_CONF}/"
 apt_update_to_full_upgrade
 
 cp "${PATH_CONF_MIN_DEPS}" "${PATH_ETC_APT_CONF}/"
 apt_update_to_full_upgrade
 

-PATH_ETC_APT_SOURCES_LIST="${PATH_ETC_APT}/sources.list"
-PATH_ETC_APT_SOURCES_D="${PATH_ETC_APT}/sources.list.d"
-PATH_CONF_SOURCES_LIST="${PATH_COPY_TAG}${PATH_ETC_APT_SOURCES_LIST}"
-PATH_CONF_SOURCES_D="${PATH_COPY_TAG}${PATH_ETC_APT_SOURCES_D}"
-PATH_CONF_SOURCES_D_DEBIAN="${PATH_CONF_SOURCES_D}/debian.sources"
-prefixed_msg "Copying over ${PATH_CONF_SOURCES_LIST}, ${PATH_CONF_SOURCES_D_DEBIAN} …"
-cp "${PATH_CONF_SOURCES_LIST}" "${PATH_ETC_APT}/"
-cp "${PATH_CONF_SOURCES_D_DEBIAN}" "${PATH_ETC_APT_SOURCES_D}/"
+prefixed_msg "Copying over entire ${PATH_ETC_APT} …"
+cd "${PATH_COPY_TAG}${PATH_ETC_APT}"
+for "${_PATH}" in $(find . -type f); do
+    DIRNAME=$(dirname "${_PATH}" | cut -c 1-)
+    mkdir -p "${DIRNAME}"
+    cp -avL * "${_PATH}" "${DIRNAME}"
+done
+

 apt_update_to_full_upgrade
 
 prefixed_msg 'Autopurge!'
 apt_update_to_full_upgrade
 
 prefixed_msg 'Autopurge!'