saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 1580cc8fa67a3f531a2173fd0553bc3b96d34988..00353baabfcf21b113a87cf8f3bc004179c8de29 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -537,6 +537,7 @@ maybe chmod 0644 'apt/sources.list.d/devolo-updates.list'
 maybe chmod 0644 'apt/sources.list.d/devolo-updates.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/devolo-updates.list.save'
 maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list'
+maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list.save'
 maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.distUpgrade'
@@ -551,6 +552,7 @@ maybe chmod 0644 'apt/sources.list.d/linphone-ubuntu-release-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/linphone-ubuntu-release-xenial.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/linphone-ubuntu-release-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/metasploit-framework.list'
+maybe chmod 0644 'apt/sources.list.d/metasploit-framework.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/metasploit-framework.list.save'
 maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.distUpgrade'
@@ -559,6 +561,7 @@ maybe chmod 0644 'apt/sources.list.d/nodesource.list'
 maybe chmod 0644 'apt/sources.list.d/nodesource.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/nodesource.list.save'
 maybe chmod 0644 'apt/sources.list.d/openscad-ubuntu-releases-bionic.list'
+maybe chmod 0644 'apt/sources.list.d/openscad-ubuntu-releases-bionic.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/openscad-ubuntu-releases-bionic.list.save'
 maybe chmod 0644 'apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.distUpgrade'
@@ -570,6 +573,7 @@ maybe chmod 0644 'apt/sources.list.d/teamviewer.list'
 maybe chmod 0644 'apt/sources.list.d/teamviewer.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/teamviewer.list.save'
 maybe chmod 0644 'apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list'
+maybe chmod 0644 'apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save'
 maybe chmod 0644 'apt/sources.list.d/webupd8team-ubuntu-java-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.distUpgrade'
@@ -579,6 +583,7 @@ maybe chmod 0644 'apt/sources.list.d/xenial-partner.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/xenial-partner.list.save'
 maybe chmod 0644 'apt/sources.list.d/yg-jensge-ubuntu-shotwell-bionic.list'
 maybe chmod 0644 'apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list'
+maybe chmod 0644 'apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.save'
 maybe chmod 0644 'apt/sources.list.d/yubico-ubuntu-stable-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/yubico-ubuntu-stable-xenial.list.distUpgrade'

diff --git a/alternatives/python b/alternatives/python
deleted file mode 120000 (symlink)
index f62ea68..0000000
--- a/alternatives/python
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/python2
\ No newline at end of file

diff --git a/apt/sources.list b/apt/sources.list
index 3fcfa9fddb48c4e6dd3ab6008e029af4229c5aba..df221b137b926488f42b393e21bf5e0935d3adab 100644 (file)
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -2,20 +2,20 @@
 
 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
 # newer versions of the distribution.
-deb http://de.archive.ubuntu.com/ubuntu/ bionic main restricted
+deb http://de.archive.ubuntu.com/ubuntu/ disco main restricted
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb http://de.archive.ubuntu.com/ubuntu/ bionic-updates main restricted
+deb http://de.archive.ubuntu.com/ubuntu/ disco-updates main restricted
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-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.
-deb http://de.archive.ubuntu.com/ubuntu/ bionic universe
+deb http://de.archive.ubuntu.com/ubuntu/ disco universe
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial universe
-deb http://de.archive.ubuntu.com/ubuntu/ bionic-updates universe
+deb http://de.archive.ubuntu.com/ubuntu/ disco-updates universe
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-updates universe
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
@@ -23,9 +23,9 @@ deb http://de.archive.ubuntu.com/ubuntu/ bionic-updates universe
 ## 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.
-deb http://de.archive.ubuntu.com/ubuntu/ bionic multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ disco multiverse
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial multiverse
-deb http://de.archive.ubuntu.com/ubuntu/ bionic-updates multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ disco-updates multiverse
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-updates multiverse
 
 ## N.B. software from this repository may not have been tested as
@@ -33,7 +33,7 @@ deb http://de.archive.ubuntu.com/ubuntu/ bionic-updates multiverse
 ## 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.
-deb http://de.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ disco-backports main restricted universe multiverse
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
 
 ## Uncomment the following two lines to add software from Canonical's
@@ -43,13 +43,13 @@ deb http://de.archive.ubuntu.com/ubuntu/ bionic-backports main restricted univer
 # deb http://archive.canonical.com/ubuntu xenial partner
 # deb-src http://archive.canonical.com/ubuntu xenial partner
 
-deb http://security.ubuntu.com/ubuntu bionic-security main restricted
+deb http://security.ubuntu.com/ubuntu disco-security main restricted
 # deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted
-deb http://security.ubuntu.com/ubuntu bionic-security universe
+deb http://security.ubuntu.com/ubuntu disco-security universe
 # deb-src http://security.ubuntu.com/ubuntu xenial-security universe
-deb http://security.ubuntu.com/ubuntu bionic-security multiverse
+deb http://security.ubuntu.com/ubuntu disco-security multiverse
 # deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse
 # deb http://archive.canonical.com/ precise partner
 # deb-src http://archive.canonical.com/ precise partner
-deb [arch=amd64,arm64,ppc64el] http://mirror2.hs-esslingen.de/mariadb/repo/10.3/ubuntu bionic main
+# deb [arch=amd64,arm64,ppc64el] http://mirror2.hs-esslingen.de/mariadb/repo/10.3/ubuntu disco main # Bei Aktualisierung zu disco deaktiviert
 # deb-src [arch=amd64,arm64,ppc64el] http://mirror2.hs-esslingen.de/mariadb/repo/10.3/ubuntu bionic main

diff --git a/apt/sources.list.d/devolo-updates.list b/apt/sources.list.d/devolo-updates.list
index 781ccb2221325f2b892fa0e9bb426cf34fe23663..cc97a31d2d2ed2ff0c3cdbe08496b28d1bdd8236 100644 (file)
--- a/apt/sources.list.d/devolo-updates.list
+++ b/apt/sources.list.d/devolo-updates.list
@@ -4,4 +4,4 @@
 # because that's what the Ubuntu Upgrade Managaer does when disabling all 
 # third-party repositories and that would cause this entry to be re-enabled.
 # See /etc/cron.daily/devolo-updates for more details.
-deb http://update.devolo.com/linux/apt/ stable main
+# deb http://update.devolo.com/linux/apt/ stable main # Bei Aktualisierung zu disco deaktiviert

diff --git a/apt/sources.list.d/devolo-updates.list.distUpgrade b/apt/sources.list.d/devolo-updates.list.distUpgrade
index 3b83eb30bf5df76e3bd8c85a00eb4a2bc05cb572..781ccb2221325f2b892fa0e9bb426cf34fe23663 100644 (file)
--- a/apt/sources.list.d/devolo-updates.list.distUpgrade
+++ b/apt/sources.list.d/devolo-updates.list.distUpgrade
@@ -4,4 +4,4 @@
 # because that's what the Ubuntu Upgrade Managaer does when disabling all 
 # third-party repositories and that would cause this entry to be re-enabled.
 # See /etc/cron.daily/devolo-updates for more details.
-# deb http://update.devolo.com/linux/apt/ stable main # Bei Aktualisierung zu bionic deaktiviert
+deb http://update.devolo.com/linux/apt/ stable main

diff --git a/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list.distUpgrade b/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list.distUpgrade
new file mode 100644 (file)
index 0000000..a0d5262
--- /dev/null
+++ b/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list.distUpgrade
@@ -0,0 +1 @@
+# deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main

diff --git a/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list b/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list
index 98d969d59174c7eb4efd34a4cc270bcfdb4663b5..b459f7ea89fc1b4a7a9b2220e91aa1094730d993 100644 (file)
--- a/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list
+++ b/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
+# deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu disco main # Bei Aktualisierung zu bionic deaktiviert Bei Aktualisierung zu disco deaktiviert
 # deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu xenial main

diff --git a/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.distUpgrade b/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.distUpgrade
index 0d98180811bae33d4f08f54c962422ed8df8c393..98d969d59174c7eb4efd34a4cc270bcfdb4663b5 100644 (file)
--- a/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.distUpgrade
+++ b/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.distUpgrade
@@ -1,2 +1,2 @@
-# deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
+deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
 # deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu xenial main

diff --git a/apt/sources.list.d/metasploit-framework.list b/apt/sources.list.d/metasploit-framework.list
index e5f2d2363d61a1bf6917d679f98e463fd101e11a..cdb15849df1acca1b22d2079cc5f71b6c3ca2f6f 100644 (file)
--- a/apt/sources.list.d/metasploit-framework.list
+++ b/apt/sources.list.d/metasploit-framework.list
@@ -1 +1 @@
-deb http://downloads.metasploit.com/data/releases/metasploit-framework/apt lucid main
+# deb http://downloads.metasploit.com/data/releases/metasploit-framework/apt lucid main # Bei Aktualisierung zu disco deaktiviert

diff --git a/apt/sources.list.d/metasploit-framework.list.distUpgrade b/apt/sources.list.d/metasploit-framework.list.distUpgrade
new file mode 100644 (file)
index 0000000..e5f2d23
--- /dev/null
+++ b/apt/sources.list.d/metasploit-framework.list.distUpgrade
@@ -0,0 +1 @@
+deb http://downloads.metasploit.com/data/releases/metasploit-framework/apt lucid main

diff --git a/apt/sources.list.d/openscad-ubuntu-releases-bionic.list b/apt/sources.list.d/openscad-ubuntu-releases-bionic.list
index 212da368ae2761d252fdb19ac7a3abe267164ae2..62a0770fa57b0f67a0fbf87c8747d947fb927374 100644 (file)
--- a/apt/sources.list.d/openscad-ubuntu-releases-bionic.list
+++ b/apt/sources.list.d/openscad-ubuntu-releases-bionic.list
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/openscad/releases/ubuntu bionic main
+# deb http://ppa.launchpad.net/openscad/releases/ubuntu disco main # Bei Aktualisierung zu disco deaktiviert
 # deb-src http://ppa.launchpad.net/openscad/releases/ubuntu bionic main

diff --git a/apt/sources.list.d/openscad-ubuntu-releases-bionic.list.distUpgrade b/apt/sources.list.d/openscad-ubuntu-releases-bionic.list.distUpgrade
new file mode 100644 (file)
index 0000000..212da36
--- /dev/null
+++ b/apt/sources.list.d/openscad-ubuntu-releases-bionic.list.distUpgrade
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/openscad/releases/ubuntu bionic main
+# deb-src http://ppa.launchpad.net/openscad/releases/ubuntu bionic main

diff --git a/apt/sources.list.d/teamviewer.list b/apt/sources.list.d/teamviewer.list
index e47093b2d5c02c31e30541a5cd465ef66a4e320f..4c44b9efd5ec642a785e7127e1758e25df8ffa72 100644 (file)
--- a/apt/sources.list.d/teamviewer.list
+++ b/apt/sources.list.d/teamviewer.list
@@ -16,7 +16,7 @@
 ###       teamviewer repo development    - additionally, make the latest development packages available
 
 
-deb http://linux.teamviewer.com/deb stable main
+# deb http://linux.teamviewer.com/deb stable main # Bei Aktualisierung zu disco deaktiviert
 
 # deb http://linux.teamviewer.com/deb preview main
 # deb http://linux.teamviewer.com/deb development main

diff --git a/apt/sources.list.d/teamviewer.list.distUpgrade b/apt/sources.list.d/teamviewer.list.distUpgrade
index 2b3319078c21006f9cc6dbb3e9f390ff83083a4e..e47093b2d5c02c31e30541a5cd465ef66a4e320f 100644 (file)
--- a/apt/sources.list.d/teamviewer.list.distUpgrade
+++ b/apt/sources.list.d/teamviewer.list.distUpgrade
@@ -11,19 +11,12 @@
 ###       teamviewer repo                - show current repository configuration
 ###       teamviewer repo default        - restore default configuration
 ###       teamviewer repo disable        - disable the repository
-###       teamviewer repo main [stable]  - make all TeamViewer packages available (default)
-###       teamviewer repo tv13 [stable]  - make TeamViewer 13 packages available
-###                             stable     omit preview and beta releases
+###       teamviewer repo stable         - make all regular TeamViewer packages available (default)
+###       teamviewer repo preview        - additionally, make feature preview packages available
+###       teamviewer repo development    - additionally, make the latest development packages available
 
 
-### Choose stable main to receive updates for TeamViewer 13 and upcoming major releases
-### Choose preview main to receive early updates for TeamViewer 13 and to receive major beta releases
+deb http://linux.teamviewer.com/deb stable main
 
-### Choose stable tv13 to receive updates for TeamViewer 13
-### Choose preview tv13 to receive early updates for TeamViewer 13
-
-# deb http://linux.teamviewer.com/deb stable main # Bei Aktualisierung zu bionic deaktiviert
-# deb http://linux.teamviewer.com/deb preview main # Bei Aktualisierung zu bionic deaktiviert
-
-# deb http://linux.teamviewer.com/deb stable tv13
-# deb http://linux.teamviewer.com/deb preview tv13
+# deb http://linux.teamviewer.com/deb preview main
+# deb http://linux.teamviewer.com/deb development main

diff --git a/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list
index 117c6980660e6180ef8c6e4ed12b83f3cd3e0b3f..450c1ebdc5a65b00596f02183e1a8e60f8eeb1eb 100644 (file)
--- a/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list
+++ b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/teejee2008/ppa/ubuntu bionic main
+# deb http://ppa.launchpad.net/teejee2008/ppa/ubuntu disco main # Bei Aktualisierung zu disco deaktiviert
 # deb-src http://ppa.launchpad.net/teejee2008/ppa/ubuntu bionic main

diff --git a/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.distUpgrade b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.distUpgrade
new file mode 100644 (file)
index 0000000..117c698
--- /dev/null
+++ b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.distUpgrade
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/teejee2008/ppa/ubuntu bionic main
+# deb-src http://ppa.launchpad.net/teejee2008/ppa/ubuntu bionic main

diff --git a/apt/sources.list.d/xenial-partner.list b/apt/sources.list.d/xenial-partner.list
index 8316d71d503cf7f7f0a209ccedae1858f6fd137a..cbfdccf02d15688bbeafe1a79fa2dfb15e12a9d6 100644 (file)
--- a/apt/sources.list.d/xenial-partner.list
+++ b/apt/sources.list.d/xenial-partner.list
@@ -1,4 +1,4 @@
 # channel for the xenial (16.04) partner channel
 # 
 #:description:This channel contains the partner software for xenial
-deb http://archive.canonical.com/ubuntu bionic partner
+deb http://archive.canonical.com/ubuntu disco partner

diff --git a/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list
index 949ea0e4080420ca7fdf762ef8d25781fd39fbee..29cf9ad12142c90cbfb4d1e5d3c8bea612240e27 100644 (file)
--- a/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list
+++ b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/yg-jensge/shotwell-unstable/ubuntu bionic main
+# deb http://ppa.launchpad.net/yg-jensge/shotwell-unstable/ubuntu disco main # Bei Aktualisierung zu disco deaktiviert
 # deb-src http://ppa.launchpad.net/yg-jensge/shotwell-unstable/ubuntu bionic main

diff --git a/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.distUpgrade b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.distUpgrade
new file mode 100644 (file)
index 0000000..949ea0e
--- /dev/null
+++ b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.distUpgrade
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/yg-jensge/shotwell-unstable/ubuntu bionic main
+# deb-src http://ppa.launchpad.net/yg-jensge/shotwell-unstable/ubuntu bionic main

diff --git a/apt/sources.list.distUpgrade b/apt/sources.list.distUpgrade
index 056b68b9d18a30af33fe934a54efb5753fc0b065..3fcfa9fddb48c4e6dd3ab6008e029af4229c5aba 100644 (file)
--- a/apt/sources.list.distUpgrade
+++ b/apt/sources.list.distUpgrade
@@ -51,3 +51,5 @@ deb http://security.ubuntu.com/ubuntu bionic-security multiverse
 # deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse
 # deb http://archive.canonical.com/ precise partner
 # deb-src http://archive.canonical.com/ precise partner
+deb [arch=amd64,arm64,ppc64el] http://mirror2.hs-esslingen.de/mariadb/repo/10.3/ubuntu bionic main
+# deb-src [arch=amd64,arm64,ppc64el] http://mirror2.hs-esslingen.de/mariadb/repo/10.3/ubuntu bionic main