From: Frank Brehm Date: Tue, 21 Jul 2020 09:25:21 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=8abe31f31e10a777b45a7e34b97cc3602cc51ba0;p=config%2Fbruni%2Fetc-mint-new1.git saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index e8e4062..8d302dd 100755 --- a/.etckeeper +++ b/.etckeeper @@ -539,19 +539,7 @@ maybe chmod 0644 'apt/sources.list.d.bak/team-xbmc-ppa-bionic.list' maybe chmod 0644 'apt/sources.list.d.bak/teams.list' maybe chmod 0644 'apt/sources.list.d.bak/ubuntu-x-swat-updates-bionic.list' maybe chmod 0644 'apt/sources.list.d.bak/webupd8team-java-bionic.list' -maybe chmod 0644 'apt/sources.list.d/flexiondotorg-minecraft-bionic.list' -maybe chmod 0644 'apt/sources.list.d/google-chrome.list' -maybe chmod 0644 'apt/sources.list.d/nextcloud-devs-client-bionic.list' maybe chmod 0644 'apt/sources.list.d/official-package-repositories.list' -maybe chmod 0644 'apt/sources.list.d/official-source-repositories.list' -maybe chmod 0644 'apt/sources.list.d/plex-media-server.list' -maybe chmod 0644 'apt/sources.list.d/plexmediaserver.list' -maybe chmod 0644 'apt/sources.list.d/puppet.list' -maybe chmod 0644 'apt/sources.list.d/signal-xenial.list' -maybe chmod 0644 'apt/sources.list.d/team-xbmc-ppa-bionic.list' -maybe chmod 0644 'apt/sources.list.d/teams.list' -maybe chmod 0644 'apt/sources.list.d/ubuntu-x-swat-updates-bionic.list' -maybe chmod 0644 'apt/sources.list.d/webupd8team-java-bionic.list' maybe chmod 0644 'apt/trusted.gpg' maybe chmod 0755 'apt/trusted.gpg.d' maybe chmod 0644 'apt/trusted.gpg.d/microsoft.gpg' diff --git a/apt/sources.list b/apt/sources.list index 3272623..e69de29 100644 --- a/apt/sources.list +++ b/apt/sources.list @@ -1 +0,0 @@ -#deb cdrom:[Linux Mint 19.3 _Tricia_ - Release amd64 20191216]/ bionic contrib main non-free diff --git a/apt/sources.list.d/flexiondotorg-minecraft-bionic.list b/apt/sources.list.d/flexiondotorg-minecraft-bionic.list deleted file mode 100644 index 93be2be..0000000 --- a/apt/sources.list.d/flexiondotorg-minecraft-bionic.list +++ /dev/null @@ -1,2 +0,0 @@ -# deb http://ppa.launchpad.net/flexiondotorg/minecraft/ubuntu bionic main -# deb-src http://ppa.launchpad.net/flexiondotorg/minecraft/ubuntu bionic main diff --git a/apt/sources.list.d/google-chrome.list b/apt/sources.list.d/google-chrome.list deleted file mode 100644 index 9d3183b..0000000 --- a/apt/sources.list.d/google-chrome.list +++ /dev/null @@ -1,3 +0,0 @@ -### THIS FILE IS AUTOMATICALLY CONFIGURED ### -# You may comment out this entry, but any other modifications may be lost. -# deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main diff --git a/apt/sources.list.d/nextcloud-devs-client-bionic.list b/apt/sources.list.d/nextcloud-devs-client-bionic.list deleted file mode 100644 index 8b22828..0000000 --- a/apt/sources.list.d/nextcloud-devs-client-bionic.list +++ /dev/null @@ -1,2 +0,0 @@ -# deb http://ppa.launchpad.net/nextcloud-devs/client/ubuntu bionic main -# deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu bionic main diff --git a/apt/sources.list.d/official-package-repositories.list b/apt/sources.list.d/official-package-repositories.list index 9cd1e66..c227106 100644 --- a/apt/sources.list.d/official-package-repositories.list +++ b/apt/sources.list.d/official-package-repositories.list @@ -1,8 +1,10 @@ -deb http://mirror.netcologne.de/linuxmint/packages tricia main upstream import backport +# Do not edit this file manually, use Software Sources instead. -deb http://ftp-stud.hs-esslingen.de/ubuntu bionic main restricted universe multiverse -deb http://ftp-stud.hs-esslingen.de/ubuntu bionic-updates main restricted universe multiverse -deb http://ftp-stud.hs-esslingen.de/ubuntu bionic-backports main restricted universe multiverse +deb http://packages.linuxmint.com ulyana main upstream import backport #id:linuxmint_main -deb http://security.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse -deb http://archive.canonical.com/ubuntu/ bionic partner +deb http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu focal-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu focal-backports main restricted universe multiverse + +deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse +deb http://archive.canonical.com/ubuntu/ focal partner diff --git a/apt/sources.list.d/official-source-repositories.list b/apt/sources.list.d/official-source-repositories.list deleted file mode 100644 index 9447e59..0000000 --- a/apt/sources.list.d/official-source-repositories.list +++ /dev/null @@ -1,8 +0,0 @@ -deb-src http://mirror.netcologne.de/linuxmint/packages tricia main upstream import backport - -deb-src http://ftp-stud.hs-esslingen.de/ubuntu bionic main restricted universe multiverse -deb-src http://ftp-stud.hs-esslingen.de/ubuntu bionic-updates main restricted universe multiverse -deb-src http://ftp-stud.hs-esslingen.de/ubuntu bionic-backports main restricted universe multiverse - -deb-src http://security.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse -deb-src http://archive.canonical.com/ubuntu/ bionic partner diff --git a/apt/sources.list.d/plex-media-server.list b/apt/sources.list.d/plex-media-server.list deleted file mode 100644 index caf7743..0000000 --- a/apt/sources.list.d/plex-media-server.list +++ /dev/null @@ -1 +0,0 @@ -#deb https://downloads.plex.tv/repo/deb ./public main diff --git a/apt/sources.list.d/plexmediaserver.list b/apt/sources.list.d/plexmediaserver.list deleted file mode 100644 index a70c33c..0000000 --- a/apt/sources.list.d/plexmediaserver.list +++ /dev/null @@ -1,3 +0,0 @@ -# When enabling this repo please remember to add the PlexPublic.Key into the apt setup. -# wget -q https://downloads.plex.tv/plex-keys/PlexSign.key -O - | sudo apt-key add - -# deb https://downloads.plex.tv/repo/deb/ public main diff --git a/apt/sources.list.d/puppet.list b/apt/sources.list.d/puppet.list deleted file mode 100644 index e2cf76b..0000000 --- a/apt/sources.list.d/puppet.list +++ /dev/null @@ -1,2 +0,0 @@ -# Puppet bionic Repository -# deb http://apt.puppetlabs.com bionic puppet diff --git a/apt/sources.list.d/signal-xenial.list b/apt/sources.list.d/signal-xenial.list deleted file mode 100644 index ea0367b..0000000 --- a/apt/sources.list.d/signal-xenial.list +++ /dev/null @@ -1 +0,0 @@ -# deb [arch=amd64] https://updates.signal.org/desktop/apt xenial main diff --git a/apt/sources.list.d/team-xbmc-ppa-bionic.list b/apt/sources.list.d/team-xbmc-ppa-bionic.list deleted file mode 100644 index fff1623..0000000 --- a/apt/sources.list.d/team-xbmc-ppa-bionic.list +++ /dev/null @@ -1,2 +0,0 @@ -# deb http://ppa.launchpad.net/team-xbmc/ppa/ubuntu bionic main -# deb-src http://ppa.launchpad.net/team-xbmc/ppa/ubuntu bionic main diff --git a/apt/sources.list.d/teams.list b/apt/sources.list.d/teams.list deleted file mode 100644 index 36cd404..0000000 --- a/apt/sources.list.d/teams.list +++ /dev/null @@ -1,3 +0,0 @@ -### THIS FILE IS AUTOMATICALLY CONFIGURED ### -# You may comment out this entry, but any other modifications may be lost. -# deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable main diff --git a/apt/sources.list.d/ubuntu-x-swat-updates-bionic.list b/apt/sources.list.d/ubuntu-x-swat-updates-bionic.list deleted file mode 100644 index edf579b..0000000 --- a/apt/sources.list.d/ubuntu-x-swat-updates-bionic.list +++ /dev/null @@ -1,2 +0,0 @@ -# deb http://ppa.launchpad.net/ubuntu-x-swat/updates/ubuntu bionic main -# deb-src http://ppa.launchpad.net/ubuntu-x-swat/updates/ubuntu bionic main diff --git a/apt/sources.list.d/webupd8team-java-bionic.list b/apt/sources.list.d/webupd8team-java-bionic.list deleted file mode 100644 index 6fad154..0000000 --- a/apt/sources.list.d/webupd8team-java-bionic.list +++ /dev/null @@ -1,2 +0,0 @@ -# deb http://ppa.launchpad.net/webupd8team/java/ubuntu bionic main -# deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu bionic main diff --git a/linuxmint/mintSystem.conf b/linuxmint/mintSystem.conf index 6fde08b..e69aa79 100644 --- a/linuxmint/mintSystem.conf +++ b/linuxmint/mintSystem.conf @@ -1,5 +1,5 @@ [global] -enabled = True +enabled = False [restore]