saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index d7bf6a335c97e80a3cfd2527e2ba65154996fd52..e428585348ff5a1dd2d1f4202e9cbb0afde5dc38 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -370,8 +370,11 @@ maybe chmod 0644 'apt/apt.conf.d/70debconf'
 maybe chmod 0755 'apt/auth.conf.d'
 maybe chmod 0755 'apt/preferences.d'
 maybe chmod 0644 'apt/sources.list'
+maybe chmod 0644 'apt/sources.list.bak'
 maybe chmod 0755 'apt/sources.list.d'
 maybe chmod 0644 'apt/sources.list.d/webmin.list'
+maybe chmod 0644 'apt/sources.list.d/webmin.list.distUpgrade'
+maybe chmod 0644 'apt/sources.list.distUpgrade'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'

diff --git a/apt/sources.list b/apt/sources.list
index 88f7e4e1101db9b276f6e34f786a2a2f15ed8d9e..dff76c78b7ac919fd74581c7060281b09f964de9 100644 (file)
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -52,3 +52,16 @@
 # deb-src http://security.ubuntu.com/ubuntu cosmic-security universe
 #mh deb http://security.ubuntu.com/ubuntu cosmic-security multiverse
 # deb-src http://security.ubuntu.com/ubuntu cosmic-security multiverse
+
+
+deb http://old-releases.ubuntu.com/ubuntu disco main restricted universe multiverse
+# deb-src http://de.archive.ubuntu.com/ubuntu cosmic main restricted universe multiverse
+
+deb http://old-releases.ubuntu.com/ubuntu disco-updates main restricted universe multiverse
+# deb-src http://de.archive.ubuntu.com/ubuntu cosmic-updates main restricted universe multiverse
+
+deb http://old-releases.ubuntu.com/ubuntu disco-security main restricted universe multiverse
+# deb-src http://de.archive.ubuntu.com/ubuntu cosmic-security main restricted universe multiverse
+
+deb http://old-releases.ubuntu.com/ubuntu disco-backports main restricted universe multiverse
+# deb-src http://de.archive.ubuntu.com/ubuntu cosmic-backports main restricted universe multiverse

diff --git a/apt/sources.list.bak b/apt/sources.list.bak
new file mode 100644 (file)
index 0000000..88f7e4e
--- /dev/null
+++ b/apt/sources.list.bak
@@ -0,0 +1,54 @@
+# deb http://asi-fs-m.contabo.net/ubuntu cosmic main restricted
+
+# deb http://asi-fs-m.contabo.net/ubuntu cosmic-updates main restricted
+# deb http://security.ubuntu.com/ubuntu cosmic-security main restricted
+
+# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
+# newer versions of the distribution.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic main restricted
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic main restricted
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic-updates main restricted
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic-updates main restricted
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic universe
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic universe
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic-updates universe
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
+## team, and may not be under a free licence. Please satisfy yourself as to 
+## your rights to use the software. Also, please note that software in 
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic multiverse
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic multiverse
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic-updates multiverse
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic-updates multiverse
+
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic-backports main restricted universe multiverse
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic-backports main restricted universe multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu cosmic partner
+# deb-src http://archive.canonical.com/ubuntu cosmic partner
+
+#mh deb http://security.ubuntu.com/ubuntu cosmic-security main restricted
+# deb-src http://security.ubuntu.com/ubuntu cosmic-security main restricted
+#mh deb http://security.ubuntu.com/ubuntu cosmic-security universe
+# deb-src http://security.ubuntu.com/ubuntu cosmic-security universe
+#mh deb http://security.ubuntu.com/ubuntu cosmic-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu cosmic-security multiverse

diff --git a/apt/sources.list.d/webmin.list.distUpgrade b/apt/sources.list.d/webmin.list.distUpgrade
new file mode 100644 (file)
index 0000000..5096244
--- /dev/null
+++ b/apt/sources.list.d/webmin.list.distUpgrade
@@ -0,0 +1 @@
+#mh deb http://download.webmin.com/download/repository sarge contrib

diff --git a/apt/sources.list.distUpgrade b/apt/sources.list.distUpgrade
new file mode 100644 (file)
index 0000000..13afb6f
--- /dev/null
+++ b/apt/sources.list.distUpgrade
@@ -0,0 +1,67 @@
+# deb http://asi-fs-m.contabo.net/ubuntu cosmic main restricted
+
+# deb http://asi-fs-m.contabo.net/ubuntu cosmic-updates main restricted
+# deb http://security.ubuntu.com/ubuntu cosmic-security main restricted
+
+# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
+# newer versions of the distribution.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic main restricted
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic main restricted
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic-updates main restricted
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic-updates main restricted
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic universe
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic universe
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic-updates universe
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
+## team, and may not be under a free licence. Please satisfy yourself as to 
+## your rights to use the software. Also, please note that software in 
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic multiverse
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic multiverse
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic-updates multiverse
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic-updates multiverse
+
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+#mh deb http://asi-fs-m.contabo.net/ubuntu cosmic-backports main restricted universe multiverse
+# deb-src http://asi-fs-m.contabo.net/ubuntu cosmic-backports main restricted universe multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu cosmic partner
+# deb-src http://archive.canonical.com/ubuntu cosmic partner
+
+#mh deb http://security.ubuntu.com/ubuntu cosmic-security main restricted
+# deb-src http://security.ubuntu.com/ubuntu cosmic-security main restricted
+#mh deb http://security.ubuntu.com/ubuntu cosmic-security universe
+# deb-src http://security.ubuntu.com/ubuntu cosmic-security universe
+#mh deb http://security.ubuntu.com/ubuntu cosmic-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu cosmic-security multiverse
+
+
+deb http://old-releases.ubuntu.com/ubuntu cosmic main restricted universe multiverse
+#deb-src http://de.archive.ubuntu.com/ubuntu cosmic main restricted universe multiverse
+
+deb http://old-releases.ubuntu.com/ubuntu cosmic-updates main restricted universe multiverse
+#deb-src http://de.archive.ubuntu.com/ubuntu cosmic-updates main restricted universe multiverse
+
+deb http://old-releases.ubuntu.com/ubuntu cosmic-security main restricted universe multiverse
+#deb-src http://de.archive.ubuntu.com/ubuntu cosmic-security main restricted universe multiverse
+
+deb http://old-releases.ubuntu.com/ubuntu cosmic-backports main restricted universe multiverse
+#deb-src http://de.archive.ubuntu.com/ubuntu cosmic-backports main restricted universe multiverse