From 08003a3dd9ed62f29bb71a572bad7ad924e48acd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mario=20H=C3=B6llein?= Date: Tue, 19 Nov 2019 20:41:38 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 1 + apt/sources.list | 4 --- apt/sources.list.d/devolo-updates.list.save | 2 +- .../ethereum-ubuntu-ethereum-xenial.list.save | 2 +- .../metasploit-framework.list.save | 2 +- .../openscad-ubuntu-releases-bionic.list.save | 2 +- apt/sources.list.d/teamviewer.list.save | 2 +- .../teejee2008-ubuntu-ppa-bionic.list.save | 2 +- apt/sources.list.d/vscode.list.save | 3 +++ apt/sources.list.d/xenial-partner.list.save | 2 +- ...-ubuntu-shotwell-unstable-bionic.list.save | 2 +- apt/sources.list.save | 26 +++++++++---------- 12 files changed, 24 insertions(+), 26 deletions(-) create mode 100644 apt/sources.list.d/vscode.list.save diff --git a/.etckeeper b/.etckeeper index 1e28437..a5fced5 100755 --- a/.etckeeper +++ b/.etckeeper @@ -784,6 +784,7 @@ maybe chmod 0644 'apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.distUpgra maybe chmod 0644 'apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save' maybe chmod 0644 'apt/sources.list.d/vscode.list' maybe chmod 0644 'apt/sources.list.d/vscode.list.distUpgrade' +maybe chmod 0644 'apt/sources.list.d/vscode.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' maybe chmod 0644 'apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save' diff --git a/apt/sources.list b/apt/sources.list index a164bfc..643406f 100644 --- a/apt/sources.list +++ b/apt/sources.list @@ -1,9 +1,7 @@ -# deb cdrom:[Ubuntu 16.04.2 LTS _Xenial Xerus_ - Release amd64 (20170215.2)]/ xenial main restricted # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # newer versions of the distribution. deb http://de.archive.ubuntu.com/ubuntu/ eoan 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. @@ -14,7 +12,6 @@ deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates main restricted ## 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/ eoan universe -# deb-src http://de.archive.ubuntu.com/ubuntu/ xenial universe deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates universe # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-updates universe @@ -24,7 +21,6 @@ deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates universe ## multiverse WILL NOT receive any review or updates from the Ubuntu ## security team. deb http://de.archive.ubuntu.com/ubuntu/ eoan multiverse -# deb-src http://de.archive.ubuntu.com/ubuntu/ xenial multiverse deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates multiverse # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-updates multiverse diff --git a/apt/sources.list.d/devolo-updates.list.save b/apt/sources.list.d/devolo-updates.list.save index 781ccb2..7fa2570 100644 --- a/apt/sources.list.d/devolo-updates.list.save +++ b/apt/sources.list.d/devolo-updates.list.save @@ -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 eoan deaktiviert 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 98d969d..b459f7e 100644 --- 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 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/metasploit-framework.list.save b/apt/sources.list.d/metasploit-framework.list.save index e5f2d23..cdb1584 100644 --- a/apt/sources.list.d/metasploit-framework.list.save +++ b/apt/sources.list.d/metasploit-framework.list.save @@ -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/openscad-ubuntu-releases-bionic.list.save b/apt/sources.list.d/openscad-ubuntu-releases-bionic.list.save index 212da36..62a0770 100644 --- a/apt/sources.list.d/openscad-ubuntu-releases-bionic.list.save +++ b/apt/sources.list.d/openscad-ubuntu-releases-bionic.list.save @@ -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/teamviewer.list.save b/apt/sources.list.d/teamviewer.list.save index e47093b..4c44b9e 100644 --- a/apt/sources.list.d/teamviewer.list.save +++ b/apt/sources.list.d/teamviewer.list.save @@ -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/teejee2008-ubuntu-ppa-bionic.list.save b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save index 117c698..450c1eb 100644 --- a/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save +++ b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save @@ -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/vscode.list.save b/apt/sources.list.d/vscode.list.save new file mode 100644 index 0000000..63dab53 --- /dev/null +++ b/apt/sources.list.d/vscode.list.save @@ -0,0 +1,3 @@ +### THIS FILE IS AUTOMATICALLY CONFIGURED ### +# You may comment out this entry, but any other modifications may be lost. +# deb [arch=amd64] http://packages.microsoft.com/repos/vscode stable main # Bei Aktualisierung zu eoan deaktiviert diff --git a/apt/sources.list.d/xenial-partner.list.save b/apt/sources.list.d/xenial-partner.list.save index 8316d71..a0aa25b 100644 --- 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 bionic partner +deb http://archive.canonical.com/ubuntu eoan partner diff --git a/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.save b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.save index 949ea0e..29cf9ad 100644 --- a/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.save +++ b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.save @@ -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.save b/apt/sources.list.save index 056b68b..643406f 100644 --- a/apt/sources.list.save +++ b/apt/sources.list.save @@ -1,21 +1,18 @@ -# deb cdrom:[Ubuntu 16.04.2 LTS _Xenial Xerus_ - Release amd64 (20170215.2)]/ xenial main restricted # 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-src http://de.archive.ubuntu.com/ubuntu/ xenial main restricted +deb http://de.archive.ubuntu.com/ubuntu/ eoan 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/ eoan-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-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/ eoan universe +deb http://de.archive.ubuntu.com/ubuntu/ eoan-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 +20,8 @@ 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-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/ eoan multiverse +deb http://de.archive.ubuntu.com/ubuntu/ eoan-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 +29,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/ eoan-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 +39,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 eoan-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 eoan-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 eoan-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 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 -- 2.43.0