saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 79a6ae620ed11b829c3357a17b09afa2e3af5af2..990ce667e3312f4924c23cd0b72b83b6188b4d23 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -254,6 +254,7 @@ 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 0755 'apt/sources.list.d'

diff --git a/apt/sources.list b/apt/sources.list
index 0e8d7dd25bde84874732b99001a1fb6c71b19d2d..d7fdefcfed604fe67b6e6487706eabdffbd1608c 100644 (file)
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -5,25 +5,25 @@
 # 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
+#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/     stretch/updates main contrib non-free
-deb-src        http://security.debian.org/     stretch/updates main contrib non-free
+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   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
+#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/  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
+#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
+# vim: noet ts=8 list

diff --git a/apt/sources.list.2 b/apt/sources.list.2
new file mode 100644 (file)
index 0000000..0e8d7dd
--- /dev/null
+++ b/apt/sources.list.2
@@ -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.d/dns-oarc.list b/apt/sources.list.d/dns-oarc.list
index e4df84444de1b3a7a9a60c6d1f9f1836bd6302d0..ffe2cfc4eefc954b1d53b04c2d13c2fcefafd0a7 100644 (file)
--- a/apt/sources.list.d/dns-oarc.list
+++ b/apt/sources.list.d/dns-oarc.list
@@ -1 +1 @@
-# deb http://pkg.dns-oarc.net/debian stretch main
+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 7e43b7596350ae90f610957403f1e4b902107746..e57191679227474182e025c39be8d4a7fc549c83 100644 (file)
--- a/apt/sources.list.d/fbrehm.list
+++ b/apt/sources.list.d/fbrehm.list
@@ -1,6 +1,6 @@
 # Packages Frank Brehm
 # ---------------------
 
-#deb   http://www.brehm-online.com/debian/stretch      ./
-deb    http://repo.uhu-banane.de/Debian/stretch                ./
+#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/salt.list b/apt/sources.list.d/salt.list
index 9383dc247bcb2a0a676ddcb96341d1f71b7e3b35..d299a18577559fc7899140b89be673407df3d90a 100644 (file)
--- a/apt/sources.list.d/salt.list
+++ b/apt/sources.list.d/salt.list
@@ -1 +1 @@
-deb    http://repo.saltstack.com/apt/debian/9/amd64/latest     stretch main
+#deb   http://repo.saltstack.com/apt/debian/9/amd64/latest     stretch main