saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 5f7f997c87b786149a7c2fbb9cee839944c13f80..e465608b1598f0ba38271aba50afd347f101bf79 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -142,7 +142,9 @@ 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.bak'
+maybe chmod 0644 'apt/sources.list.bak.0'
+maybe chmod 0644 'apt/sources.list.bak.1'
+maybe chmod 0644 'apt/sources.list.bak.2'
 maybe chmod 0755 'apt/sources.list.d'
 maybe chmod 0644 'apt/sources.list.d/fbrehm.list'
 maybe chmod 0644 'apt/sources.list.d/fbrehm.list.bak'

diff --git a/apt/sources.list b/apt/sources.list
index ae6ae7962644cf54732248a7ca4266e7e74d0580..2a8e0c527df61c68eecdf20327dfe358ce4c5529 100644 (file)
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -1,23 +1,23 @@
 #
 
-# deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main
+# deb cdrom:[Debian GNU/Linux buster-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main
 
-# deb  http://ftp-stud.hs-esslingen.de/debian  stretch         main
+# deb  http://ftp-stud.hs-esslingen.de/debian  buster          main
 
-# main stretch repositories
-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
+# main buster repositories
+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
+# buster 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-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
+# buster-updates, previously known as 'volatile'
+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-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
+# buster-backports, previously on backports.debian.org
+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

diff --git a/apt/sources.list.bak b/apt/sources.list.bak
deleted file mode 100644 (file)
index 764a998..0000000
--- a/apt/sources.list.bak
+++ /dev/null
@@ -1,19 +0,0 @@
-# deb  http://ftp-stud.hs-esslingen.de/debian  jessie          main
-
-# main jessie repositories
-deb    http://ftp-stud.hs-esslingen.de/debian  jessie          main contrib non-free
-deb-src        http://ftp-stud.hs-esslingen.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-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-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.bak.0 b/apt/sources.list.bak.0
new file mode 100644 (file)
index 0000000..764a998
--- /dev/null
+++ b/apt/sources.list.bak.0
@@ -0,0 +1,19 @@
+# deb  http://ftp-stud.hs-esslingen.de/debian  jessie          main
+
+# main jessie repositories
+deb    http://ftp-stud.hs-esslingen.de/debian  jessie          main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.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-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-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.bak.1 b/apt/sources.list.bak.1
new file mode 100644 (file)
index 0000000..ae6ae79
--- /dev/null
+++ b/apt/sources.list.bak.1
@@ -0,0 +1,23 @@
+#
+
+# deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main
+
+# deb  http://ftp-stud.hs-esslingen.de/debian  stretch         main
+
+# main stretch repositories
+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-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-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.bak.2 b/apt/sources.list.bak.2
new file mode 100644 (file)
index 0000000..2a8e0c5
--- /dev/null
+++ b/apt/sources.list.bak.2
@@ -0,0 +1,23 @@
+#
+
+# deb cdrom:[Debian GNU/Linux buster-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main
+
+# deb  http://ftp-stud.hs-esslingen.de/debian  buster          main
+
+# main buster repositories
+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
+
+# buster 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
+
+# buster-updates, previously known as 'volatile'
+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
+
+# buster-backports, previously on backports.debian.org
+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

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               ./