From: Mario Höllein Date: Sat, 27 Oct 2018 15:01:36 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=5b4d7471044f19201c60918f1ff3155946541c08;p=zenbook saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index 328429c..8e7ee0a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -512,60 +512,38 @@ 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-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' -maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.save' maybe chmod 0644 'apt/sources.list.d/google.list' maybe chmod 0644 'apt/sources.list.d/google.list.distUpgrade' -maybe chmod 0644 'apt/sources.list.d/google.list.save' maybe chmod 0644 'apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list' maybe chmod 0644 'apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.distUpgrade' -maybe chmod 0644 'apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.save' 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/mozillateam-ubuntu-firefox-next-xenial.list' maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.distUpgrade' -maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save' 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.save' -maybe chmod 0644 'apt/sources.list.d/openshot_developers-ubuntu-libopenshot-daily-bionic.list' -maybe chmod 0644 'apt/sources.list.d/openshot_developers-ubuntu-libopenshot-daily-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' -maybe chmod 0644 'apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save' maybe chmod 0644 'apt/sources.list.d/signal-xenial.list' maybe chmod 0644 'apt/sources.list.d/signal-xenial.list.distUpgrade' -maybe chmod 0644 'apt/sources.list.d/signal-xenial.list.save' 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.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' maybe chmod 0644 'apt/sources.list.d/xenial-partner.list' 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-bionic.list.save' 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.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' -maybe chmod 0644 'apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save' maybe chmod 0664 'apt/sources.list.distUpgrade' maybe chmod 0664 'apt/sources.list.save' maybe chmod 0644 'apt/trusted.gpg' @@ -577,8 +555,6 @@ maybe chmod 0644 'apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg' maybe chmod 0644 'apt/trusted.gpg.d/linphone_ubuntu_release.gpg' maybe chmod 0644 'apt/trusted.gpg.d/mozillateam_ubuntu_firefox-next.gpg' maybe chmod 0644 'apt/trusted.gpg.d/openscad_ubuntu_releases.gpg' -maybe chmod 0644 'apt/trusted.gpg.d/openshot_developers_ubuntu_libopenshot-daily.gpg' -maybe chmod 0644 'apt/trusted.gpg.d/openshot_developers_ubuntu_ppa.gpg' maybe chmod 0644 'apt/trusted.gpg.d/privacyidea_ubuntu_privacyidea-dev.gpg' maybe chmod 0644 'apt/trusted.gpg.d/teejee2008_ubuntu_ppa.gpg' maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg' diff --git a/apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list.save b/apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list.save deleted file mode 100644 index f2642d2..0000000 --- a/apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list.save +++ /dev/null @@ -1,2 +0,0 @@ -# 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/bumblebee-ubuntu-stable-xenial.list.save b/apt/sources.list.d/bumblebee-ubuntu-stable-xenial.list.save deleted file mode 100644 index e69de29..0000000 diff --git a/apt/sources.list.d/devolo-updates.list.save b/apt/sources.list.d/devolo-updates.list.save deleted file mode 100644 index 781ccb2..0000000 --- a/apt/sources.list.d/devolo-updates.list.save +++ /dev/null @@ -1,7 +0,0 @@ -### THIS FILE IS AUTOMATICALLY CONFIGURED ### -# You may comment out this entry, but any other modifications may be lost. -# In particular, do not add a comment behind the entry on the same line, -# 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 diff --git a/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list.save b/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list.save deleted file mode 100644 index a0d5262..0000000 --- a/apt/sources.list.d/ethereum-ubuntu-ethereum-bionic.list.save +++ /dev/null @@ -1 +0,0 @@ -# deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic 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 deleted file mode 100644 index 98d969d..0000000 --- a/apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.save +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 459dbe2..0000000 --- a/apt/sources.list.d/google.list.save +++ /dev/null @@ -1 +0,0 @@ -# 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 deleted file mode 100644 index 2d4fb8e..0000000 --- a/apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.save +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index de17098..0000000 --- a/apt/sources.list.d/linphone-ubuntu-release-xenial.list.save +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index 292bdd4..0000000 --- a/apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index e0278d9..0000000 --- a/apt/sources.list.d/nodesource.list.save +++ /dev/null @@ -1,2 +0,0 @@ -# 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/openscad-ubuntu-releases-bionic.list.save b/apt/sources.list.d/openscad-ubuntu-releases-bionic.list.save deleted file mode 100644 index 212da36..0000000 --- a/apt/sources.list.d/openscad-ubuntu-releases-bionic.list.save +++ /dev/null @@ -1,2 +0,0 @@ -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/openshot_developers-ubuntu-libopenshot-daily-bionic.list b/apt/sources.list.d/openshot_developers-ubuntu-libopenshot-daily-bionic.list deleted file mode 100644 index b74cd3d..0000000 --- a/apt/sources.list.d/openshot_developers-ubuntu-libopenshot-daily-bionic.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://ppa.launchpad.net/openshot.developers/libopenshot-daily/ubuntu bionic main -deb-src http://ppa.launchpad.net/openshot.developers/libopenshot-daily/ubuntu bionic main -# deb-src http://ppa.launchpad.net/openshot.developers/libopenshot-daily/ubuntu bionic main -# deb-src http://ppa.launchpad.net/openshot.developers/libopenshot-daily/ubuntu bionic main diff --git a/apt/sources.list.d/openshot_developers-ubuntu-libopenshot-daily-bionic.list.save b/apt/sources.list.d/openshot_developers-ubuntu-libopenshot-daily-bionic.list.save deleted file mode 100644 index ab3ce1a..0000000 --- a/apt/sources.list.d/openshot_developers-ubuntu-libopenshot-daily-bionic.list.save +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/openshot.developers/libopenshot-daily/ubuntu bionic main -# deb-src http://ppa.launchpad.net/openshot.developers/libopenshot-daily/ubuntu bionic main 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 deleted file mode 100644 index f24a134..0000000 --- a/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index 217a590..0000000 --- a/apt/sources.list.d/signal-xenial.list.save +++ /dev/null @@ -1 +0,0 @@ -# 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 deleted file mode 100644 index 2b33190..0000000 --- a/apt/sources.list.d/teamviewer.list.save +++ /dev/null @@ -1,29 +0,0 @@ -### TeamViewer DEB repository list - -### NOTE: Manual changes to this file -### - prevent it from being updated by TeamViewer package updates -### - will be lost after using the 'teamviewer repo' command -### The original file can be restored with this command: -### cp /opt/teamviewer/tv_bin/script/teamviewer.list /etc/apt/sources.list.d/teamviewer.list -### which has the same effect as 'teamviewer repo default' - -### NOTE: It is preferred to use the following commands to edit this file: -### 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 - - -### 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 - -### 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 diff --git a/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save deleted file mode 100644 index 117c698..0000000 --- a/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save +++ /dev/null @@ -1,2 +0,0 @@ -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/webupd8team-ubuntu-java-xenial.list.save b/apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save deleted file mode 100644 index 5739a71..0000000 --- a/apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index 8316d71..0000000 --- a/apt/sources.list.d/xenial-partner.list.save +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/apt/sources.list.d/yg-jensge-ubuntu-shotwell-bionic.list.save b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-bionic.list.save deleted file mode 100644 index e69de29..0000000 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 deleted file mode 100644 index 949ea0e..0000000 --- a/apt/sources.list.d/yg-jensge-ubuntu-shotwell-unstable-bionic.list.save +++ /dev/null @@ -1,2 +0,0 @@ -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.d/yubico-ubuntu-stable-xenial.list.save b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save deleted file mode 100644 index e08035b..0000000 --- a/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save +++ /dev/null @@ -1,3 +0,0 @@ -# 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/trusted.gpg.d/openshot_developers_ubuntu_libopenshot-daily.gpg b/apt/trusted.gpg.d/openshot_developers_ubuntu_libopenshot-daily.gpg deleted file mode 100644 index 45ed26b..0000000 Binary files a/apt/trusted.gpg.d/openshot_developers_ubuntu_libopenshot-daily.gpg and /dev/null differ diff --git a/apt/trusted.gpg.d/openshot_developers_ubuntu_ppa.gpg b/apt/trusted.gpg.d/openshot_developers_ubuntu_ppa.gpg deleted file mode 100644 index 45ed26b..0000000 Binary files a/apt/trusted.gpg.d/openshot_developers_ubuntu_ppa.gpg and /dev/null differ