saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 1fb53efdf8e7b14f810f2c4a2b8416eb45d7c829..e7c1d2601ce248b92c27665a399e1f747a2ebea7 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -506,11 +506,13 @@ maybe chmod 0664 'apt/sources.list'
 maybe chmod 0755 'apt/sources.list.d'
 maybe chmod 0644 'apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list.distUpgrade'
+maybe chmod 0644 'apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/bumblebee-ubuntu-stable-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/bumblebee-ubuntu-stable-xenial.list.save'
 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-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.save'

diff --git a/apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list.save b/apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list.save
new file mode 100644 (file)
index 0000000..f2642d2
--- /dev/null
+++ b/apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list.save
@@ -0,0 +1,2 @@
+# deb http://ppa.launchpad.net/bitcoin/bitcoin/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
+# deb-src http://ppa.launchpad.net/bitcoin/bitcoin/ubuntu xenial main

diff --git a/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list b/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list
new file mode 100644 (file)
index 0000000..a0d5262
--- /dev/null
+++ b/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list
@@ -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 0d98180811bae33d4f08f54c962422ed8df8c393..98d969d59174c7eb4efd34a4cc270bcfdb4663b5 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 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/ethereum-ubuntu-ethereum-xenial.list.save b/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.save
index bbe74c4978e06a1280ebf40a3ccda299e327e849..0d98180811bae33d4f08f54c962422ed8df8c393 100644 (file)
--- a/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.save
+++ b/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.save
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu xenial main
+# 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/google.list.save b/apt/sources.list.d/google.list.save
index 7c60c5415db8812498fde9c7797b4738c82326c5..459dbe2b64141820a9d1700e59bdc377da04cdad 100644 (file)
--- a/apt/sources.list.d/google.list.save
+++ b/apt/sources.list.d/google.list.save
@@ -1 +1 @@
-deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main
+# deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main # Bei Aktualisierung zu bionic deaktiviert

diff --git a/apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.save b/apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.save
index 10765e2dd860a462b20b0ad49d640901a6da5b5c..2d4fb8e74fab320ae1105a1bac6754a0ec119743 100644 (file)
--- a/apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.save
+++ b/apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.save
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu xenial main
+# deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
 # deb-src http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu xenial main

diff --git a/apt/sources.list.d/linphone-ubuntu-release-xenial.list.save b/apt/sources.list.d/linphone-ubuntu-release-xenial.list.save
index 7e03df83d17309b9e0902fe3a57fe88e3c078cc1..de17098bcc2cc46ef2ccfb697ae7a8800bcb8730 100644 (file)
--- a/apt/sources.list.d/linphone-ubuntu-release-xenial.list.save
+++ b/apt/sources.list.d/linphone-ubuntu-release-xenial.list.save
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/linphone/release/ubuntu xenial main
+# deb http://ppa.launchpad.net/linphone/release/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
 # deb-src http://ppa.launchpad.net/linphone/release/ubuntu xenial main

diff --git a/apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save b/apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save
index f6c0b5a8eab664724d12b21d823abfee5f23cfec..292bdd4ba8940ece3e3674e4e164bf3ca17bc774 100644 (file)
--- a/apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save
+++ b/apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/mozillateam/firefox-next/ubuntu xenial main
+# deb http://ppa.launchpad.net/mozillateam/firefox-next/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
 # deb-src http://ppa.launchpad.net/mozillateam/firefox-next/ubuntu xenial main

diff --git a/apt/sources.list.d/nodesource.list.save b/apt/sources.list.d/nodesource.list.save
index 2e1f64d28aec293816c7d1d9008fd829e19fc27d..e0278d9b69fd9315d8472d1435cfac5b76c25a06 100644 (file)
--- a/apt/sources.list.d/nodesource.list.save
+++ b/apt/sources.list.d/nodesource.list.save
@@ -1,2 +1,2 @@
-deb https://deb.nodesource.com/node_0.10 xenial main
-deb-src https://deb.nodesource.com/node_0.10 xenial main
+# deb https://deb.nodesource.com/node_0.10 bionic main # Bei Aktualisierung zu bionic deaktiviert
+# deb-src https://deb.nodesource.com/node_0.10 bionic main # Bei Aktualisierung zu bionic deaktiviert

diff --git a/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save b/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save
index fa6fbfaf6f7339c7f0dd5496c82b3a8858763241..f24a134188311eb94bdfe9cf07080c7eb8358a79 100644 (file)
--- a/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save
+++ b/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/privacyidea/privacyidea-dev/ubuntu xenial main
+# deb http://ppa.launchpad.net/privacyidea/privacyidea-dev/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
 # deb-src http://ppa.launchpad.net/privacyidea/privacyidea-dev/ubuntu xenial main

diff --git a/apt/sources.list.d/signal-xenial.list.save b/apt/sources.list.d/signal-xenial.list.save
index d16d2b4abf9044f2c96c909e81c75954a4b93c21..217a5907e0c229fc1e80f3e49bdc87c0986717ae 100644 (file)
--- a/apt/sources.list.d/signal-xenial.list.save
+++ b/apt/sources.list.d/signal-xenial.list.save
@@ -1 +1 @@
-deb [arch=amd64] https://updates.signal.org/desktop/apt xenial main
+# deb [arch=amd64] https://updates.signal.org/desktop/apt bionic main # Bei Aktualisierung zu bionic deaktiviert

diff --git a/apt/sources.list.d/teamviewer.list.save b/apt/sources.list.d/teamviewer.list.save
index 4cd18bda1a477d0d5557b672406d84e79e45b235..2b3319078c21006f9cc6dbb3e9f390ff83083a4e 100644 (file)
--- a/apt/sources.list.d/teamviewer.list.save
+++ b/apt/sources.list.d/teamviewer.list.save
@@ -22,8 +22,8 @@
 ### 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
-deb http://linux.teamviewer.com/deb preview main
+# 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

diff --git a/apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save b/apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save
index 501341a491961ca5a95cee02608106d62bd83299..5739a715c15ae754a21ddc76bbacf77724b383b1 100644 (file)
--- a/apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save
+++ b/apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main
+# deb http://ppa.launchpad.net/webupd8team/java/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
 # deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main

diff --git a/apt/sources.list.d/xenial-partner.list.save b/apt/sources.list.d/xenial-partner.list.save
index 959f6a6af4aebcdd79481c51ae153b7707c0ea1b..8316d71d503cf7f7f0a209ccedae1858f6fd137a 100644 (file)
--- a/apt/sources.list.d/xenial-partner.list.save
+++ b/apt/sources.list.d/xenial-partner.list.save
@@ -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 xenial partner
+deb http://archive.canonical.com/ubuntu bionic partner

diff --git a/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save
index 36f70497479ab80740dc0638aa773230e4f4d970..e08035bf7c89c4e523f864661ea151d9b7c3c488 100644 (file)
--- a/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save
+++ b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save
@@ -1,3 +1,3 @@
-deb http://ppa.launchpad.net/yubico/stable/ubuntu xenial main
+# deb http://ppa.launchpad.net/yubico/stable/ubuntu bionic main # Bei Aktualisierung zu bionic deaktiviert
 # deb-src http://ppa.launchpad.net/yubico/stable/ubuntu xenial main
 # deb-src http://ppa.launchpad.net/yubico/stable/ubuntu xenial main

diff --git a/apt/sources.list.save b/apt/sources.list.save
index c79c601303940846e1789f2353810f6307454341..056b68b9d18a30af33fe934a54efb5753fc0b065 100644 (file)
--- a/apt/sources.list.save
+++ b/apt/sources.list.save
@@ -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/ xenial main restricted
+deb http://de.archive.ubuntu.com/ubuntu/ bionic 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/ xenial-updates main restricted
+deb http://de.archive.ubuntu.com/ubuntu/ bionic-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/ xenial universe
+deb http://de.archive.ubuntu.com/ubuntu/ bionic universe
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial universe
-deb http://de.archive.ubuntu.com/ubuntu/ xenial-updates universe
+deb http://de.archive.ubuntu.com/ubuntu/ bionic-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/ xenial-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/ xenial multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ bionic multiverse
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial multiverse
-deb http://de.archive.ubuntu.com/ubuntu/ xenial-updates multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ bionic-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/ xenial-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/ xenial-backports main restricted universe multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ bionic-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,11 +43,11 @@ deb http://de.archive.ubuntu.com/ubuntu/ xenial-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 xenial-security main restricted
+deb http://security.ubuntu.com/ubuntu bionic-security main restricted
 # deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted
-deb http://security.ubuntu.com/ubuntu xenial-security universe
+deb http://security.ubuntu.com/ubuntu bionic-security universe
 # deb-src http://security.ubuntu.com/ubuntu xenial-security universe
-deb http://security.ubuntu.com/ubuntu xenial-security multiverse
+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 http://archive.canonical.com/ precise partner
 # deb-src http://archive.canonical.com/ precise partner

diff --git a/apt/trusted.gpg.d/ethereum_ubuntu_ethereum.gpg b/apt/trusted.gpg.d/ethereum_ubuntu_ethereum.gpg
index 122d1e7ebd45baab0c636ca9f9bed218d60e725c..259134090d8e5fac2adebc7bfe1908e07da6d512 100644 (file)
Binary files a/apt/trusted.gpg.d/ethereum_ubuntu_ethereum.gpg and b/apt/trusted.gpg.d/ethereum_ubuntu_ethereum.gpg differ