From 9019d3b653cc225432041b707e645df485f89fb5 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Tue, 23 Oct 2018 14:44:48 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 10 ---------- apt/sources.list | 1 - .../certbot-certbot-trusty.list | 2 -- apt/sources.list.d/devolo-updates.list | 7 ------- apt/sources.list.d/docker.list | 1 - .../formorer-icinga-trusty.list | 2 -- apt/sources.list.d/getdeb.list | 1 - .../mc3man-trusty-media-trusty.list | 2 -- apt/sources.list.d/nodesource.list | 2 -- .../official-package-repositories.list | 13 ++++++------- apt/sources.list.d/ondrej-php-trusty.list | 2 -- apt/sources.list.d/team-xbmc-ppa-trusty.list | 2 -- apt/sources.list.d/x2go-stable-trusty.list | 2 -- apt/trusted.gpg | Bin 36344 -> 38580 bytes 14 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 apt/sources.list.d/certbot-certbot-trusty.list delete mode 100644 apt/sources.list.d/devolo-updates.list delete mode 100644 apt/sources.list.d/docker.list delete mode 100644 apt/sources.list.d/formorer-icinga-trusty.list delete mode 100644 apt/sources.list.d/getdeb.list delete mode 100644 apt/sources.list.d/mc3man-trusty-media-trusty.list delete mode 100644 apt/sources.list.d/nodesource.list delete mode 100644 apt/sources.list.d/ondrej-php-trusty.list delete mode 100644 apt/sources.list.d/team-xbmc-ppa-trusty.list delete mode 100644 apt/sources.list.d/x2go-stable-trusty.list diff --git a/.etckeeper b/.etckeeper index b4c57160..03bdabf8 100755 --- a/.etckeeper +++ b/.etckeeper @@ -708,17 +708,7 @@ maybe chmod 0644 './apt/preferences.d/official-extra-repositories.pref' maybe chmod 0644 './apt/preferences.d/official-package-repositories.pref' maybe chmod 0664 './apt/sources.list' maybe chmod 0755 './apt/sources.list.d' -maybe chmod 0644 './apt/sources.list.d/certbot-certbot-trusty.list' -maybe chmod 0644 './apt/sources.list.d/devolo-updates.list' -maybe chmod 0644 './apt/sources.list.d/docker.list' -maybe chmod 0644 './apt/sources.list.d/formorer-icinga-trusty.list' -maybe chmod 0644 './apt/sources.list.d/getdeb.list' -maybe chmod 0644 './apt/sources.list.d/mc3man-trusty-media-trusty.list' -maybe chmod 0644 './apt/sources.list.d/nodesource.list' maybe chmod 0644 './apt/sources.list.d/official-package-repositories.list' -maybe chmod 0644 './apt/sources.list.d/ondrej-php-trusty.list' -maybe chmod 0644 './apt/sources.list.d/team-xbmc-ppa-trusty.list' -maybe chmod 0644 './apt/sources.list.d/x2go-stable-trusty.list' maybe chmod 0600 './apt/trustdb.gpg' maybe chmod 0644 './apt/trusted.gpg' maybe chmod 0755 './apt/trusted.gpg.d' diff --git a/apt/sources.list b/apt/sources.list index 9a57af78..e69de29b 100644 --- a/apt/sources.list +++ b/apt/sources.list @@ -1 +0,0 @@ -#deb cdrom:[Linux Mint 17.2 _Rafaela_ - Release amd64 20150721]/ trusty contrib main non-free diff --git a/apt/sources.list.d/certbot-certbot-trusty.list b/apt/sources.list.d/certbot-certbot-trusty.list deleted file mode 100644 index ba8bfd44..00000000 --- a/apt/sources.list.d/certbot-certbot-trusty.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/certbot/certbot/ubuntu trusty main -deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu trusty main diff --git a/apt/sources.list.d/devolo-updates.list b/apt/sources.list.d/devolo-updates.list deleted file mode 100644 index 781ccb22..00000000 --- a/apt/sources.list.d/devolo-updates.list +++ /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/docker.list b/apt/sources.list.d/docker.list deleted file mode 100644 index 8d29620b..00000000 --- a/apt/sources.list.d/docker.list +++ /dev/null @@ -1 +0,0 @@ -deb https://apt.dockerproject.org/repo ubuntu-trusty main diff --git a/apt/sources.list.d/formorer-icinga-trusty.list b/apt/sources.list.d/formorer-icinga-trusty.list deleted file mode 100644 index 2025ffac..00000000 --- a/apt/sources.list.d/formorer-icinga-trusty.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/formorer/icinga/ubuntu trusty main -deb-src http://ppa.launchpad.net/formorer/icinga/ubuntu trusty main diff --git a/apt/sources.list.d/getdeb.list b/apt/sources.list.d/getdeb.list deleted file mode 100644 index 503efee7..00000000 --- a/apt/sources.list.d/getdeb.list +++ /dev/null @@ -1 +0,0 @@ -# deb http://archive.getdeb.net/ubuntu trusty-getdeb apps diff --git a/apt/sources.list.d/mc3man-trusty-media-trusty.list b/apt/sources.list.d/mc3man-trusty-media-trusty.list deleted file mode 100644 index 3d9f9de7..00000000 --- a/apt/sources.list.d/mc3man-trusty-media-trusty.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/mc3man/trusty-media/ubuntu trusty main -deb-src http://ppa.launchpad.net/mc3man/trusty-media/ubuntu trusty main diff --git a/apt/sources.list.d/nodesource.list b/apt/sources.list.d/nodesource.list deleted file mode 100644 index 32a97c90..00000000 --- a/apt/sources.list.d/nodesource.list +++ /dev/null @@ -1,2 +0,0 @@ -deb https://deb.nodesource.com/node_4.x trusty main -deb-src https://deb.nodesource.com/node_4.x trusty main diff --git a/apt/sources.list.d/official-package-repositories.list b/apt/sources.list.d/official-package-repositories.list index ae8feadc..bf9214c4 100644 --- a/apt/sources.list.d/official-package-repositories.list +++ b/apt/sources.list.d/official-package-repositories.list @@ -1,9 +1,8 @@ -deb http://packages.linuxmint.com rosa main upstream import +deb http://packages.linuxmint.com sarah main upstream import backport -deb http://extra.linuxmint.com rosa main +deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu xenial-backports main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse - -deb http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse -deb http://archive.canonical.com/ubuntu/ trusty partner +deb http://security.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse +deb http://archive.canonical.com/ubuntu/ xenial partner diff --git a/apt/sources.list.d/ondrej-php-trusty.list b/apt/sources.list.d/ondrej-php-trusty.list deleted file mode 100644 index 4b755fd9..00000000 --- a/apt/sources.list.d/ondrej-php-trusty.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/ondrej/php/ubuntu trusty main -deb-src http://ppa.launchpad.net/ondrej/php/ubuntu trusty main diff --git a/apt/sources.list.d/team-xbmc-ppa-trusty.list b/apt/sources.list.d/team-xbmc-ppa-trusty.list deleted file mode 100644 index f3d5c93c..00000000 --- a/apt/sources.list.d/team-xbmc-ppa-trusty.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/team-xbmc/ppa/ubuntu trusty main -deb-src http://ppa.launchpad.net/team-xbmc/ppa/ubuntu trusty main diff --git a/apt/sources.list.d/x2go-stable-trusty.list b/apt/sources.list.d/x2go-stable-trusty.list deleted file mode 100644 index ec44daab..00000000 --- a/apt/sources.list.d/x2go-stable-trusty.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/x2go/stable/ubuntu trusty main -deb-src http://ppa.launchpad.net/x2go/stable/ubuntu trusty main diff --git a/apt/trusted.gpg b/apt/trusted.gpg index 77113a99b38711e98bcd0ba9fe01291ed56192e1..36fcd891aaa8f14f82fbae8abec5ea3bb11b1144 100644 GIT binary patch delta 2236 zcmV;t2t)Vyn*y}00-zF4Mkr!Si_XIfnPi61m$Un;khr0KN5XD~}0kXc@l>hTl%e>>1(Uo~!$Q0+6+ z#QBXnqsV?q6s)jn#Da$sKf$La2iY#cUiOMTu-L+WruR%newV}Je*k_JEWc)wGv*XnVY)95 zfROL)RMB96Ohj`*`1F%FDo0do)^Vtd`M86aO>XPuv&LkpD{6fQ3WXOaq;o}!wQam+ z3@?ZKv~6F^W`}5)lU|*RDCqTqAr&k=imDysRud!HV02ieVYS4^ax!jG5-%_?Yr@Q7 zY;%(wCv29*TShZ6F5gTc=vu~9;}VU101*KI0kk$uX>N6RAWdm*bRbe?aBp*IbZ>Hb zAX8~)ZfS03AWLO=AUtw!Z*)LxX>N6RZE0?FE@N+PK8XT11QP)Y03iheS44-}lZ-hZ zf2Lt!2}K*b^3)^`|8Sz)d)se&2_^}DW+C%h9SarGmT`T9 z5->lOME_j%=#kv{>Rf)_`$D0QprF>ne|5I(JL+?$8D9bSJhP+kRoDpviT>P#?aj0B z^L$lU8&NcieAqL=6;Q2+DPyWY3jL>lpToc4&0FEJLVdF4xC^MG)i!kTg0K2b`dkNr z(kL@#P$F&0a-p%J<(Ao-1)>Uyf$bZ*1(ZO8Io_AWVEetC{*Ci(YHcg?94M}*I=RmBW%)a zVYLb3gU)yT4^#uxGH;v;4#iQP=e0M_AhdLI_RjTz`u`;=zxT54NCef8KR%E<7ZS~$ z!?y`5E{W@xcTnH)k*RjU`{km5$xUfq5-s~>N9?04sRe0^yiB}#kUd4Ze~CE9!1zhN zX9lB(#YWlMPk)Z<@h*0ru24Kjj*Ebi{b~(Uut1~D%hrilk<;opz;|0&Lad}M<1e<6X!bzy(38P#tAvp+ka6N*ja>|q={ah2w&$+(%@FeHG=ei2#}rq<+HQ$Eh20jWk!`bt?N zkYhVnxPj$0CT@TI)%3d9dI@~$0(Wt=oLhVvsNx|cf8l~#@RD7+z*r?vS_9Tln>O%k zA`4f|xuiJ{8QwOkZBCne^Ua}^aO_~B;zsQGTRl%Bcq3DoV*xi}K2Um+7A2<1-h3TC znYnsIG|`gNg|~f04CCi;-<^NP9s3NJrw^za;)M^TTx|o{ONzF&u5;KA7v$z3@-=Frp3yaX8n&q*v2BOkpB8?IU?aRm zYpOkBN&X6XOD?%B=8>hTe_9lhMi-E0U55h>;K~ z)}nmIduLt}|E1Py(gkf8F(=38!JvCsvL7KMSFuFjD9eYx3lIuL-R&0)C|yb*;gz0X Kr59MR0ssTfFf|we delta 9 Qcmdn8mg&cArVT%O0U199E&u=k -- 2.43.0