From 77806b59152cf074b9af8061f31d186384ff98c6 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 18 Jul 2017 13:50:07 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 3 +++ apt/sources.list | 26 +++++++++++++------------- apt/sources.list.bak | 19 +++++++++++++++++++ apt/sources.list.d/fbrehm.list | 4 ++-- apt/sources.list.d/fbrehm.list.bak | 6 ++++++ apt/sources.list.d/salt.list | 2 +- apt/sources.list.d/salt.list.bak | 1 + 7 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 apt/sources.list.bak create mode 100644 apt/sources.list.d/fbrehm.list.bak create mode 100644 apt/sources.list.d/salt.list.bak diff --git a/.etckeeper b/.etckeeper index d91a00f..38fc7d2 100755 --- a/.etckeeper +++ b/.etckeeper @@ -238,9 +238,12 @@ maybe chmod 0755 'apt/preferences.d' maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key.pub' maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub' maybe chmod 0644 'apt/sources.list' +maybe chmod 0644 'apt/sources.list.bak' maybe chmod 0755 'apt/sources.list.d' maybe chmod 0644 'apt/sources.list.d/fbrehm.list' +maybe chmod 0644 'apt/sources.list.d/fbrehm.list.bak' maybe chmod 0644 'apt/sources.list.d/salt.list' +maybe chmod 0644 'apt/sources.list.d/salt.list.bak' maybe chmod 0644 'apt/trusted.gpg' maybe chmod 0755 'apt/trusted.gpg.d' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-jessie-automatic.gpg' diff --git a/apt/sources.list b/apt/sources.list index 764a998..88838d9 100644 --- a/apt/sources.list +++ b/apt/sources.list @@ -1,19 +1,19 @@ -# deb http://ftp-stud.hs-esslingen.de/debian jessie main +# deb http://ftp-stud.hs-esslingen.de/debian stretch main -# main jessie repositories -deb http://ftp-stud.hs-esslingen.de/debian jessie main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian jessie main contrib non-free +# main stretch repositories +deb http://ftp-stud.hs-esslingen.de/debian stretch main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian stretch main contrib non-free -# jessie security updates -deb http://security.debian.org/ jessie/updates main contrib non-free -deb-src http://security.debian.org/ jessie/updates main contrib non-free +# stretch security updates +deb http://security.debian.org/ stretch/updates main contrib non-free +deb-src http://security.debian.org/ stretch/updates main contrib non-free -# jessie-updates, previously known as 'volatile' -deb http://ftp-stud.hs-esslingen.de/debian jessie-updates main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian jessie-updates main contrib non-free +# stretch-updates, previously known as 'volatile' +deb http://ftp-stud.hs-esslingen.de/debian stretch-updates main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian stretch-updates main contrib non-free -# jessie-backports, previously on backports.debian.org -deb http://ftp-stud.hs-esslingen.de/debian/ jessie-backports main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian/ jessie-backports main contrib non-free +# stretch-backports, previously on backports.debian.org +deb http://ftp-stud.hs-esslingen.de/debian/ stretch-backports main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian/ stretch-backports main contrib non-free # vim: noet ts=8 diff --git a/apt/sources.list.bak b/apt/sources.list.bak new file mode 100644 index 0000000..764a998 --- /dev/null +++ b/apt/sources.list.bak @@ -0,0 +1,19 @@ +# deb http://ftp-stud.hs-esslingen.de/debian jessie main + +# main jessie repositories +deb http://ftp-stud.hs-esslingen.de/debian jessie main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian jessie main contrib non-free + +# jessie security updates +deb http://security.debian.org/ jessie/updates main contrib non-free +deb-src http://security.debian.org/ jessie/updates main contrib non-free + +# jessie-updates, previously known as 'volatile' +deb http://ftp-stud.hs-esslingen.de/debian jessie-updates main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian jessie-updates main contrib non-free + +# jessie-backports, previously on backports.debian.org +deb http://ftp-stud.hs-esslingen.de/debian/ jessie-backports main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian/ jessie-backports main contrib non-free + +# vim: noet ts=8 diff --git a/apt/sources.list.d/fbrehm.list b/apt/sources.list.d/fbrehm.list index d773712..7e43b75 100644 --- a/apt/sources.list.d/fbrehm.list +++ b/apt/sources.list.d/fbrehm.list @@ -1,6 +1,6 @@ # Packages Frank Brehm # --------------------- -#deb http://www.brehm-online.com/debian/jessie ./ -deb http://repo.uhu-banane.de/Debian/jessie ./ +#deb http://www.brehm-online.com/debian/stretch ./ +deb http://repo.uhu-banane.de/Debian/stretch ./ deb-src http://repo.uhu-banane.de/Sources ./ diff --git a/apt/sources.list.d/fbrehm.list.bak b/apt/sources.list.d/fbrehm.list.bak new file mode 100644 index 0000000..d773712 --- /dev/null +++ b/apt/sources.list.d/fbrehm.list.bak @@ -0,0 +1,6 @@ +# Packages Frank Brehm +# --------------------- + +#deb http://www.brehm-online.com/debian/jessie ./ +deb http://repo.uhu-banane.de/Debian/jessie ./ +deb-src http://repo.uhu-banane.de/Sources ./ diff --git a/apt/sources.list.d/salt.list b/apt/sources.list.d/salt.list index 846108d..9383dc2 100644 --- a/apt/sources.list.d/salt.list +++ b/apt/sources.list.d/salt.list @@ -1 +1 @@ -deb http://repo.saltstack.com/apt/debian/8/amd64/latest jessie main +deb http://repo.saltstack.com/apt/debian/9/amd64/latest stretch main diff --git a/apt/sources.list.d/salt.list.bak b/apt/sources.list.d/salt.list.bak new file mode 100644 index 0000000..846108d --- /dev/null +++ b/apt/sources.list.d/salt.list.bak @@ -0,0 +1 @@ +deb http://repo.saltstack.com/apt/debian/8/amd64/latest jessie main -- 2.39.5