From 821f6203c43201eb3cac6936f10e1537593db280 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 20 May 2025 04:30:30 +0200 Subject: [PATCH] Fix. --- bookworm/copy/all/etc/apt/sources.list | 4 ---- .../copy/all/etc/apt/sources.list.d/debian.sources | 11 +++++++++++ testing/copy/all/etc/apt/sources.list | 2 -- testing/copy/all/etc/apt/sources.list.d/sources.list | 11 +++++++++++ trixie/copy/all/etc/apt/sources.list | 4 ---- trixie/copy/all/etc/apt/sources.list.d/debian.sources | 11 +++++++++++ trixie/scripts/from_older_upgrade.sh | 2 +- 7 files changed, 34 insertions(+), 11 deletions(-) delete mode 100644 bookworm/copy/all/etc/apt/sources.list create mode 100644 bookworm/copy/all/etc/apt/sources.list.d/debian.sources delete mode 100644 testing/copy/all/etc/apt/sources.list create mode 100644 testing/copy/all/etc/apt/sources.list.d/sources.list delete mode 100644 trixie/copy/all/etc/apt/sources.list create mode 100644 trixie/copy/all/etc/apt/sources.list.d/debian.sources diff --git a/bookworm/copy/all/etc/apt/sources.list b/bookworm/copy/all/etc/apt/sources.list deleted file mode 100644 index 72b0ffb..0000000 --- a/bookworm/copy/all/etc/apt/sources.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware -deb http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware -deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware -deb http://ftp.debian.org/debian bookworm-backports main contrib non-free non-free-firmware diff --git a/bookworm/copy/all/etc/apt/sources.list.d/debian.sources b/bookworm/copy/all/etc/apt/sources.list.d/debian.sources new file mode 100644 index 0000000..cf3e051 --- /dev/null +++ b/bookworm/copy/all/etc/apt/sources.list.d/debian.sources @@ -0,0 +1,11 @@ +Types: deb deb-src +URIs: mirror+file:///etc/apt/mirrors/debian.list +Suites: bookworm bookworm-updates bookworm-backports +Components: main contrib non-free non-free-non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: mirror+file:///etc/apt/mirrors/debian-security.list +Suites: bookworm-security +Components: main contrib non-free non-free-non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg diff --git a/testing/copy/all/etc/apt/sources.list b/testing/copy/all/etc/apt/sources.list deleted file mode 100644 index 9671eed..0000000 --- a/testing/copy/all/etc/apt/sources.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://deb.debian.org/debian testing main contrib non-free non-free-firmware -deb http://security.debian.org/debian-security testing-security main contrib non-free non-free-firmware diff --git a/testing/copy/all/etc/apt/sources.list.d/sources.list b/testing/copy/all/etc/apt/sources.list.d/sources.list new file mode 100644 index 0000000..5f90c8f --- /dev/null +++ b/testing/copy/all/etc/apt/sources.list.d/sources.list @@ -0,0 +1,11 @@ +Types: deb deb-src +URIs: mirror+file:///etc/apt/mirrors/debian.list +Suites: testing +Components: main contrib non-free non-free-non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: mirror+file:///etc/apt/mirrors/debian-security.list +Suites: testing-security +Components: main contrib non-free non-free-non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg diff --git a/trixie/copy/all/etc/apt/sources.list b/trixie/copy/all/etc/apt/sources.list deleted file mode 100644 index c22075b..0000000 --- a/trixie/copy/all/etc/apt/sources.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware -deb http://security.debian.org/debian-security trixie-security main contrib non-free non-free-firmware -deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware -deb http://ftp.debian.org/debian trixie-backports main contrib non-free non-free-firmware diff --git a/trixie/copy/all/etc/apt/sources.list.d/debian.sources b/trixie/copy/all/etc/apt/sources.list.d/debian.sources new file mode 100644 index 0000000..88f005d --- /dev/null +++ b/trixie/copy/all/etc/apt/sources.list.d/debian.sources @@ -0,0 +1,11 @@ +Types: deb deb-src +URIs: mirror+file:///etc/apt/mirrors/debian.list +Suites: trixie trixie-updates trixie-backports +Components: main contrib non-free non-free-non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg + +Types: deb deb-src +URIs: mirror+file:///etc/apt/mirrors/debian-security.list +Suites: trixie-security +Components: main contrib non-free non-free-non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg diff --git a/trixie/scripts/from_older_upgrade.sh b/trixie/scripts/from_older_upgrade.sh index 5843a68..a14cda7 100755 --- a/trixie/scripts/from_older_upgrade.sh +++ b/trixie/scripts/from_older_upgrade.sh @@ -46,7 +46,7 @@ prefixed_msg "Copying over ${PATH_CONF_MIN_DEPS} …" cp "${PATH_CONF_MIN_DEPS}" "${PATH_ETC_APT_CONF}/" apt_update_to_full_upgrade -PATH_CONF_SOURCES="${PATH_COPY_TAG}${PATH_ETC_APT}/sources.list" +PATH_CONF_SOURCES="${PATH_COPY_TAG}${PATH_ETC_APT}/sources.list.d/debian.sources" prefixed_msg "Copying over ${PATH_CONF_SOURCES} …" cp "${PATH_CONF_SOURCES}" "${PATH_ETC_APT}/" apt_update_to_full_upgrade -- 2.30.2