From d607d3764f2b367567f0ee0b19f5cd39bc3ad56b Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 16 Sep 2021 11:11:27 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 12 ++++--- apt/sources.list | 31 +++++++------------ ...k.1 => sources.list.2017-03-06.jessie.bak} | 0 ...bak => sources.list.2017-06-17.jessie.bak} | 0 ....2 => sources.list.2018-08-25.stretch.bak} | 0 apt/sources.list.2019-09-04.buster.bak | 29 +++++++++++++++++ apt/sources.list.d/dns-oarc.list | 4 ++- .../dns-oarc.list.2019-09-04.buster.bak | 1 + apt/sources.list.d/fbrehm.list | 5 +-- .../fbrehm.list.2019-09-04.buster.bak | 6 ++++ apt/sources.list.d/fbrehm.list.bak | 6 ---- apt/sources.list.d/salt.list | 2 +- .../salt.list.2021-04-08.buster.bak | 2 ++ apt/sources.list.d/salt.list.bak | 1 - 14 files changed, 63 insertions(+), 36 deletions(-) rename apt/{sources.list.bak.1 => sources.list.2017-03-06.jessie.bak} (100%) rename apt/{sources.list.bak => sources.list.2017-06-17.jessie.bak} (100%) rename apt/{sources.list.2 => sources.list.2018-08-25.stretch.bak} (100%) create mode 100644 apt/sources.list.2019-09-04.buster.bak create mode 100644 apt/sources.list.d/dns-oarc.list.2019-09-04.buster.bak create mode 100644 apt/sources.list.d/fbrehm.list.2019-09-04.buster.bak delete mode 100644 apt/sources.list.d/fbrehm.list.bak create mode 100644 apt/sources.list.d/salt.list.2021-04-08.buster.bak delete mode 100644 apt/sources.list.d/salt.list.bak diff --git a/.etckeeper b/.etckeeper index 7823161..1856a10 100755 --- a/.etckeeper +++ b/.etckeeper @@ -268,15 +268,17 @@ maybe chmod 0755 'apt/preferences.d' maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key.pub' maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub' maybe chmod 0644 'apt/sources.list' -maybe chmod 0644 'apt/sources.list.2' -maybe chmod 0644 'apt/sources.list.bak' -maybe chmod 0644 'apt/sources.list.bak.1' +maybe chmod 0644 'apt/sources.list.2017-03-06.jessie.bak' +maybe chmod 0644 'apt/sources.list.2017-06-17.jessie.bak' +maybe chmod 0644 'apt/sources.list.2018-08-25.stretch.bak' +maybe chmod 0644 'apt/sources.list.2019-09-04.buster.bak' maybe chmod 0755 'apt/sources.list.d' maybe chmod 0644 'apt/sources.list.d/dns-oarc.list' +maybe chmod 0644 'apt/sources.list.d/dns-oarc.list.2019-09-04.buster.bak' maybe chmod 0644 'apt/sources.list.d/fbrehm.list' -maybe chmod 0644 'apt/sources.list.d/fbrehm.list.bak' +maybe chmod 0644 'apt/sources.list.d/fbrehm.list.2019-09-04.buster.bak' maybe chmod 0644 'apt/sources.list.d/salt.list' -maybe chmod 0644 'apt/sources.list.d/salt.list.bak' +maybe chmod 0644 'apt/sources.list.d/salt.list.2021-04-08.buster.bak' maybe chmod 0644 'apt/trusted.gpg' maybe chmod 0755 'apt/trusted.gpg.d' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bullseye-automatic.gpg' diff --git a/apt/sources.list b/apt/sources.list index d7fdefc..fa06cbc 100644 --- a/apt/sources.list +++ b/apt/sources.list @@ -2,28 +2,19 @@ # deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main -# deb http://ftp.plusline.de/debian stretch main +# main bullseye repositories +deb http://ftp-stud.hs-esslingen.de/debian bullseye main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian bullseye main contrib non-free -# main stretch repositories -#deb http://ftp.plusline.de/debian buster main contrib non-free -#deb-src http://ftp.plusline.de/debian buster main contrib non-free -deb http://ftp-stud.hs-esslingen.de/debian buster main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian buster main contrib non-free +# bullseye security updates +deb http://security.debian.org/debian-security bullseye-security main contrib non-free -# stretch security updates -deb http://security.debian.org/ buster/updates main contrib non-free -deb-src http://security.debian.org/ buster/updates main contrib non-free +# bullseye-updates, previously known as 'volatile' +deb http://ftp-stud.hs-esslingen.de/debian bullseye-updates main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian bullseye-updates main contrib non-free -# stretch-updates, previously known as 'volatile' -#deb http://ftp.plusline.de/debian buster-updates main contrib non-free -#deb-src http://ftp.plusline.de/debian buster-updates main contrib non-free -deb http://ftp-stud.hs-esslingen.de/debian buster-updates main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian buster-updates main contrib non-free - -# stretch-backports, previously on backports.debian.org -#deb http://ftp.plusline.de/debian/ buster-backports main contrib non-free -#deb-src http://ftp.plusline.de/debian/ buster-backports main contrib non-free -deb http://ftp-stud.hs-esslingen.de/debian/ buster-backports main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian/ buster-backports main contrib non-free +# bullseye-backports +deb http://ftp-stud.hs-esslingen.de/debian bullseye-backports main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian bullseye-backports main contrib non-free # vim: noet ts=8 list diff --git a/apt/sources.list.bak.1 b/apt/sources.list.2017-03-06.jessie.bak similarity index 100% rename from apt/sources.list.bak.1 rename to apt/sources.list.2017-03-06.jessie.bak diff --git a/apt/sources.list.bak b/apt/sources.list.2017-06-17.jessie.bak similarity index 100% rename from apt/sources.list.bak rename to apt/sources.list.2017-06-17.jessie.bak diff --git a/apt/sources.list.2 b/apt/sources.list.2018-08-25.stretch.bak similarity index 100% rename from apt/sources.list.2 rename to apt/sources.list.2018-08-25.stretch.bak diff --git a/apt/sources.list.2019-09-04.buster.bak b/apt/sources.list.2019-09-04.buster.bak new file mode 100644 index 0000000..d7fdefc --- /dev/null +++ b/apt/sources.list.2019-09-04.buster.bak @@ -0,0 +1,29 @@ +# + +# deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main + +# deb http://ftp.plusline.de/debian stretch main + +# main stretch repositories +#deb http://ftp.plusline.de/debian buster main contrib non-free +#deb-src http://ftp.plusline.de/debian buster main contrib non-free +deb http://ftp-stud.hs-esslingen.de/debian buster main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian buster main contrib non-free + +# stretch security updates +deb http://security.debian.org/ buster/updates main contrib non-free +deb-src http://security.debian.org/ buster/updates main contrib non-free + +# stretch-updates, previously known as 'volatile' +#deb http://ftp.plusline.de/debian buster-updates main contrib non-free +#deb-src http://ftp.plusline.de/debian buster-updates main contrib non-free +deb http://ftp-stud.hs-esslingen.de/debian buster-updates main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian buster-updates main contrib non-free + +# stretch-backports, previously on backports.debian.org +#deb http://ftp.plusline.de/debian/ buster-backports main contrib non-free +#deb-src http://ftp.plusline.de/debian/ buster-backports main contrib non-free +deb http://ftp-stud.hs-esslingen.de/debian/ buster-backports main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian/ buster-backports main contrib non-free + +# vim: noet ts=8 list diff --git a/apt/sources.list.d/dns-oarc.list b/apt/sources.list.d/dns-oarc.list index ffe2cfc..1957064 100644 --- a/apt/sources.list.d/dns-oarc.list +++ b/apt/sources.list.d/dns-oarc.list @@ -1 +1,3 @@ -deb http://pkg.dns-oarc.net/debian buster main +deb http://pkg.dns-oarc.net/debian bullseye main + +# vim: noet ts=8 list diff --git a/apt/sources.list.d/dns-oarc.list.2019-09-04.buster.bak b/apt/sources.list.d/dns-oarc.list.2019-09-04.buster.bak new file mode 100644 index 0000000..ffe2cfc --- /dev/null +++ b/apt/sources.list.d/dns-oarc.list.2019-09-04.buster.bak @@ -0,0 +1 @@ +deb http://pkg.dns-oarc.net/debian buster main diff --git a/apt/sources.list.d/fbrehm.list b/apt/sources.list.d/fbrehm.list index e571916..80f3f0b 100644 --- a/apt/sources.list.d/fbrehm.list +++ b/apt/sources.list.d/fbrehm.list @@ -1,6 +1,7 @@ # Packages Frank Brehm # --------------------- -#deb http://www.brehm-online.com/debian/buster ./ -deb http://repo.uhu-banane.de/Debian/buster ./ +deb http://repo.uhu-banane.de/Debian/bullseye ./ deb-src http://repo.uhu-banane.de/Sources ./ + +# vim: noet ts=8 list diff --git a/apt/sources.list.d/fbrehm.list.2019-09-04.buster.bak b/apt/sources.list.d/fbrehm.list.2019-09-04.buster.bak new file mode 100644 index 0000000..e571916 --- /dev/null +++ b/apt/sources.list.d/fbrehm.list.2019-09-04.buster.bak @@ -0,0 +1,6 @@ +# Packages Frank Brehm +# --------------------- + +#deb http://www.brehm-online.com/debian/buster ./ +deb http://repo.uhu-banane.de/Debian/buster ./ +deb-src http://repo.uhu-banane.de/Sources ./ diff --git a/apt/sources.list.d/fbrehm.list.bak b/apt/sources.list.d/fbrehm.list.bak deleted file mode 100644 index d773712..0000000 --- a/apt/sources.list.d/fbrehm.list.bak +++ /dev/null @@ -1,6 +0,0 @@ -# Packages Frank Brehm -# --------------------- - -#deb http://www.brehm-online.com/debian/jessie ./ -deb http://repo.uhu-banane.de/Debian/jessie ./ -deb-src http://repo.uhu-banane.de/Sources ./ diff --git a/apt/sources.list.d/salt.list b/apt/sources.list.d/salt.list index 2623898..0227b25 100644 --- a/apt/sources.list.d/salt.list +++ b/apt/sources.list.d/salt.list @@ -1,2 +1,2 @@ #deb http://repo.saltstack.com/apt/debian/9/amd64/latest stretch main -deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg] https://repo.saltproject.io/py3/debian/10/amd64/latest buster main +# deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg] https://repo.saltproject.io/py3/debian/10/amd64/latest buster main diff --git a/apt/sources.list.d/salt.list.2021-04-08.buster.bak b/apt/sources.list.d/salt.list.2021-04-08.buster.bak new file mode 100644 index 0000000..2623898 --- /dev/null +++ b/apt/sources.list.d/salt.list.2021-04-08.buster.bak @@ -0,0 +1,2 @@ +#deb http://repo.saltstack.com/apt/debian/9/amd64/latest stretch main +deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg] https://repo.saltproject.io/py3/debian/10/amd64/latest buster main diff --git a/apt/sources.list.d/salt.list.bak b/apt/sources.list.d/salt.list.bak deleted file mode 100644 index 846108d..0000000 --- a/apt/sources.list.d/salt.list.bak +++ /dev/null @@ -1 +0,0 @@ -deb http://repo.saltstack.com/apt/debian/8/amd64/latest jessie main -- 2.39.5