From: Mario Höllein Date: Wed, 27 Jun 2018 08:26:38 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=c1f5ace62ac1a68e55bbeee8b27352ae5caf8709;p=zenbook saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index 57d98ce..a356189 100755 --- a/.etckeeper +++ b/.etckeeper @@ -472,6 +472,7 @@ maybe chmod 0755 'apt/sources.list.d' 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.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.save' maybe chmod 0644 'apt/sources.list.d/google-chrome.list' @@ -481,11 +482,15 @@ 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.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.save' maybe chmod 0644 'apt/sources.list.d/nodesource.list' +maybe chmod 0644 'apt/sources.list.d/nodesource.list.save' maybe chmod 0644 'apt/sources.list.d/teamviewer.list' +maybe chmod 0644 'apt/sources.list.d/teamviewer.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.save' maybe chmod 0644 'apt/sources.list.d/xenial-partner.list' +maybe chmod 0644 'apt/sources.list.d/xenial-partner.list.save' maybe chmod 0664 'apt/sources.list.save' maybe chmod 0644 'apt/trusted.gpg' maybe chmod 0755 'apt/trusted.gpg.d' diff --git a/apt/sources.list b/apt/sources.list index 5b974a3..c79c601 100644 --- a/apt/sources.list +++ b/apt/sources.list @@ -49,3 +49,5 @@ deb http://security.ubuntu.com/ubuntu xenial-security universe # deb-src http://security.ubuntu.com/ubuntu xenial-security universe deb http://security.ubuntu.com/ubuntu xenial-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 diff --git a/apt/sources.list.d/devolo-updates.list.save b/apt/sources.list.d/devolo-updates.list.save new file mode 100644 index 0000000..781ccb2 --- /dev/null +++ b/apt/sources.list.d/devolo-updates.list.save @@ -0,0 +1,7 @@ +### 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/mozillateam-ubuntu-firefox-next-xenial.list.save b/apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save new file mode 100644 index 0000000..f6c0b5a --- /dev/null +++ b/apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/mozillateam/firefox-next/ubuntu xenial main +# 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 new file mode 100644 index 0000000..2e1f64d --- /dev/null +++ b/apt/sources.list.d/nodesource.list.save @@ -0,0 +1,2 @@ +deb https://deb.nodesource.com/node_0.10 xenial main +deb-src https://deb.nodesource.com/node_0.10 xenial main diff --git a/apt/sources.list.d/teamviewer.list.save b/apt/sources.list.d/teamviewer.list.save new file mode 100644 index 0000000..4cd18bd --- /dev/null +++ b/apt/sources.list.d/teamviewer.list.save @@ -0,0 +1,29 @@ +### 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 +deb http://linux.teamviewer.com/deb preview main + +# deb http://linux.teamviewer.com/deb stable tv13 +# deb http://linux.teamviewer.com/deb preview tv13 diff --git a/apt/sources.list.d/xenial-partner.list.save b/apt/sources.list.d/xenial-partner.list.save new file mode 100644 index 0000000..959f6a6 --- /dev/null +++ b/apt/sources.list.d/xenial-partner.list.save @@ -0,0 +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 diff --git a/cups/printers.conf.O b/cups/printers.conf.O index b73dccf..92931bc 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -37,22 +37,3 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job - -UUID urn:uuid:d78788e6-f7c1-3413-5af5-fb69250922d4 -Info TEST @ linux-a5xv -Location linux-a5xv.local -DeviceURI ipps://linux-a5xv.local:631/printers/TEST -State Idle -StateTime 1529403358 -ConfigTime 1529407251 -Type 6 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job -Option cups-browsed true -