saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 7823161eb1ad9d6f9b99de4224e696cd76234fcc..1856a100876f52f221c10e6eb5439b28f02ebcf8 100755 (executable)
--- 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 d7fdefcfed604fe67b6e6487706eabdffbd1608c..fa06cbcc41b1d11ed4c908a19cbae0b240242740 100644 (file)
--- 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.2 b/apt/sources.list.2
deleted file mode 100644 (file)
index 0e8d7dd..0000000
--- a/apt/sources.list.2
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-
-# 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   stretch         main contrib non-free
-#deb-src       http://ftp.plusline.de/debian   stretch         main contrib non-free
-deb    http://ftp-stud.hs-esslingen.de/debian  stretch         main contrib non-free
-deb-src        http://ftp-stud.hs-esslingen.de/debian  stretch         main contrib non-free
-
-# stretch security updates
-deb    http://security.debian.org/     stretch/updates main contrib non-free
-deb-src        http://security.debian.org/     stretch/updates main contrib non-free
-
-# stretch-updates, previously known as 'volatile'
-#deb   http://ftp.plusline.de/debian   stretch-updates main contrib non-free
-#deb-src       http://ftp.plusline.de/debian   stretch-updates main contrib non-free
-deb    http://ftp-stud.hs-esslingen.de/debian  stretch-updates main contrib non-free
-deb-src        http://ftp-stud.hs-esslingen.de/debian  stretch-updates main contrib non-free
-
-# stretch-backports, previously on backports.debian.org
-#deb   http://ftp.plusline.de/debian/  stretch-backports       main contrib non-free
-#deb-src       http://ftp.plusline.de/debian/  stretch-backports       main contrib non-free
-deb    http://ftp-stud.hs-esslingen.de/debian/ stretch-backports       main contrib non-free
-deb-src        http://ftp-stud.hs-esslingen.de/debian/ stretch-backports       main contrib non-free
-
-# vim: noet ts=8

diff --git a/apt/sources.list.2017-03-06.jessie.bak b/apt/sources.list.2017-03-06.jessie.bak
new file mode 100644 (file)
index 0000000..73cea58
--- /dev/null
+++ b/apt/sources.list.2017-03-06.jessie.bak
@@ -0,0 +1,25 @@
+# deb  http://ftp.plusline.de/debian   jessie          main
+
+# main jessie repositories
+deb    http://ftp.plusline.de/debian   jessie          main contrib non-free
+deb-src        http://ftp.plusline.de/debian   jessie          main contrib non-free
+
+# jessie security updates
+deb    http://security.debian.org/     jessie/updates  main contrib non-free
+deb-src        http://security.debian.org/     jessie/updates  main contrib non-free
+
+# jessie-updates, previously known as 'volatile'
+#deb   http://ftp.plusline.de/debian   jessie-updates  main contrib non-free
+#deb-src       http://ftp.plusline.de/debian   jessie-updates  main contrib non-free
+deb    http://ftp-stud.hs-esslingen.de/debian  jessie-updates  main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian  jessie-updates  main contrib non-free
+
+
+# jessie-backports, previously on backports.debian.org
+#deb   http://ftp.plusline.de/debian/  jessie-backports        main contrib non-free
+#deb-src       http://ftp.plusline.de/debian/  jessie-backports        main contrib non-free
+deb    http://ftp-stud.hs-esslingen.de/debian/ jessie-backports        main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian/ jessie-backports        main contrib non-free
+
+
+# vim: noet ts=8

diff --git a/apt/sources.list.2017-06-17.jessie.bak b/apt/sources.list.2017-06-17.jessie.bak
new file mode 100644 (file)
index 0000000..b4aab5b
--- /dev/null
+++ b/apt/sources.list.2017-06-17.jessie.bak
@@ -0,0 +1,19 @@
+# deb  http://ftp.plusline.de/debian   jessie          main
+
+# main jessie repositories
+deb    http://ftp.plusline.de/debian   jessie          main contrib non-free
+deb-src        http://ftp.plusline.de/debian   jessie          main contrib non-free
+
+# jessie security updates
+deb    http://security.debian.org/     jessie/updates  main contrib non-free
+deb-src        http://security.debian.org/     jessie/updates  main contrib non-free
+
+# jessie-updates, previously known as 'volatile'
+deb    http://ftp.plusline.de/debian   jessie-updates  main contrib non-free
+deb-src        http://ftp.plusline.de/debian   jessie-updates  main contrib non-free
+
+# jessie-backports, previously on backports.debian.org
+deb    http://ftp.plusline.de/debian/  jessie-backports        main contrib non-free
+deb-src        http://ftp.plusline.de/debian/  jessie-backports        main contrib non-free
+
+# vim: noet ts=8

diff --git a/apt/sources.list.2018-08-25.stretch.bak b/apt/sources.list.2018-08-25.stretch.bak
new file mode 100644 (file)
index 0000000..0e8d7dd
--- /dev/null
+++ b/apt/sources.list.2018-08-25.stretch.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   stretch         main contrib non-free
+#deb-src       http://ftp.plusline.de/debian   stretch         main contrib non-free
+deb    http://ftp-stud.hs-esslingen.de/debian  stretch         main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian  stretch         main contrib non-free
+
+# stretch security updates
+deb    http://security.debian.org/     stretch/updates main contrib non-free
+deb-src        http://security.debian.org/     stretch/updates main contrib non-free
+
+# stretch-updates, previously known as 'volatile'
+#deb   http://ftp.plusline.de/debian   stretch-updates main contrib non-free
+#deb-src       http://ftp.plusline.de/debian   stretch-updates main contrib non-free
+deb    http://ftp-stud.hs-esslingen.de/debian  stretch-updates main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian  stretch-updates main contrib non-free
+
+# stretch-backports, previously on backports.debian.org
+#deb   http://ftp.plusline.de/debian/  stretch-backports       main contrib non-free
+#deb-src       http://ftp.plusline.de/debian/  stretch-backports       main contrib non-free
+deb    http://ftp-stud.hs-esslingen.de/debian/ stretch-backports       main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian/ stretch-backports       main contrib non-free
+
+# vim: noet ts=8

diff --git a/apt/sources.list.2019-09-04.buster.bak b/apt/sources.list.2019-09-04.buster.bak
new file mode 100644 (file)
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.bak b/apt/sources.list.bak
deleted file mode 100644 (file)
index b4aab5b..0000000
--- a/apt/sources.list.bak
+++ /dev/null
@@ -1,19 +0,0 @@
-# deb  http://ftp.plusline.de/debian   jessie          main
-
-# main jessie repositories
-deb    http://ftp.plusline.de/debian   jessie          main contrib non-free
-deb-src        http://ftp.plusline.de/debian   jessie          main contrib non-free
-
-# jessie security updates
-deb    http://security.debian.org/     jessie/updates  main contrib non-free
-deb-src        http://security.debian.org/     jessie/updates  main contrib non-free
-
-# jessie-updates, previously known as 'volatile'
-deb    http://ftp.plusline.de/debian   jessie-updates  main contrib non-free
-deb-src        http://ftp.plusline.de/debian   jessie-updates  main contrib non-free
-
-# jessie-backports, previously on backports.debian.org
-deb    http://ftp.plusline.de/debian/  jessie-backports        main contrib non-free
-deb-src        http://ftp.plusline.de/debian/  jessie-backports        main contrib non-free
-
-# vim: noet ts=8

diff --git a/apt/sources.list.bak.1 b/apt/sources.list.bak.1
deleted file mode 100644 (file)
index 73cea58..0000000
--- a/apt/sources.list.bak.1
+++ /dev/null
@@ -1,25 +0,0 @@
-# deb  http://ftp.plusline.de/debian   jessie          main
-
-# main jessie repositories
-deb    http://ftp.plusline.de/debian   jessie          main contrib non-free
-deb-src        http://ftp.plusline.de/debian   jessie          main contrib non-free
-
-# jessie security updates
-deb    http://security.debian.org/     jessie/updates  main contrib non-free
-deb-src        http://security.debian.org/     jessie/updates  main contrib non-free
-
-# jessie-updates, previously known as 'volatile'
-#deb   http://ftp.plusline.de/debian   jessie-updates  main contrib non-free
-#deb-src       http://ftp.plusline.de/debian   jessie-updates  main contrib non-free
-deb    http://ftp-stud.hs-esslingen.de/debian  jessie-updates  main contrib non-free
-deb-src        http://ftp-stud.hs-esslingen.de/debian  jessie-updates  main contrib non-free
-
-
-# jessie-backports, previously on backports.debian.org
-#deb   http://ftp.plusline.de/debian/  jessie-backports        main contrib non-free
-#deb-src       http://ftp.plusline.de/debian/  jessie-backports        main contrib non-free
-deb    http://ftp-stud.hs-esslingen.de/debian/ jessie-backports        main contrib non-free
-deb-src        http://ftp-stud.hs-esslingen.de/debian/ jessie-backports        main contrib non-free
-
-
-# vim: noet ts=8

diff --git a/apt/sources.list.d/dns-oarc.list b/apt/sources.list.d/dns-oarc.list
index ffe2cfc4eefc954b1d53b04c2d13c2fcefafd0a7..1957064c096c38596868caa91fd738f332f92cd0 100644 (file)
--- 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 (file)
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 e57191679227474182e025c39be8d4a7fc549c83..80f3f0b4d379e4150495e7d04e015e4d2c10a68f 100644 (file)
--- 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 (file)
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 (file)
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 2623898de9b58fec459372344e14ef4eb8d5efa4..0227b25d3aaa750f13f02e31b9f73bcb5750b007 100644 (file)
--- 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 (file)
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 (file)
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