From: Michael Prokop Date: Mon, 22 Jun 2015 16:11:31 +0000 (+0200) Subject: sources.list: fix comments and drop unused entries X-Git-Tag: v0.26.8~2 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=f793321796e38144cbd6bf9418c073718705e62f sources.list: fix comments and drop unused entries There's no point in shipping the ftp.at.debian.org/ftp.de.debian.org entries anymore since we're using ftp.debian.org by default nowadays Drop the misleading "mirror selected via geo-ip" comments, since we're using ftp.debian.org nowadays (and neither http.debian.net nor httpredir.debian.org) --- diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH index 1788c87..f9908e8 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH @@ -1,15 +1,3 @@ -# official debian repository (mirror selected via geo-ip): +# official debian repository: deb http://ftp.debian.org/debian/ etch main contrib non-free deb-src http://ftp.debian.org/debian/ etch main contrib non-free - -# official debian repository: -# deb http://ftp.debian.org/debian/ etch main contrib non-free -# deb-src http://ftp.debian.org/debian/ etch main contrib non-free - -# official debian DE repository: -# deb http://ftp.de.debian.org/debian/ etch main contrib non-free -# deb-src http://ftp.de.debian.org/debian/ etch main contrib non-free - -# official debian AT repository: -# deb http://ftp.at.debian.org/debian/ etch main contrib non-free -# deb-src http://ftp.at.debian.org/debian/ etch main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY index a76b7c6..9f9aaab 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY @@ -1,19 +1,7 @@ -# official debian repository (mirror selected via geo-ip): +# official debian repository: deb http://ftp.debian.org/debian/ lenny main contrib non-free deb-src http://ftp.debian.org/debian/ lenny main contrib non-free # security updates: deb http://security.debian.org/ lenny/updates main contrib deb-src http://security.debian.org/ lenny/updates main contrib - -# official debian repository: -# deb http://ftp.debian.org/debian/ lenny main contrib non-free -# deb-src http://ftp.debian.org/debian/ lenny main contrib non-free - -# official debian DE repository: -# deb http://ftp.de.debian.org/debian/ lenny main contrib non-free -# deb-src http://ftp.de.debian.org/debian/ lenny main contrib non-free - -# official debian AT repository: -# deb http://ftp.at.debian.org/debian/ lenny main contrib non-free -# deb-src http://ftp.at.debian.org/debian/ lenny main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID index 7818d1e..b20afb0 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID @@ -1,15 +1,3 @@ -# official debian repository (mirror selected via geo-ip): +# official debian repository: deb http://ftp.debian.org/debian/ sid main contrib non-free deb-src http://ftp.debian.org/debian/ sid main contrib non-free - -# official debian repository: -# deb http://ftp.debian.org/debian/ sid main contrib non-free -# deb-src http://ftp.debian.org/debian/ sid main contrib non-free - -# official debian DE repository: -# deb http://ftp.de.debian.org/debian/ sid main contrib non-free -# deb-src http://ftp.de.debian.org/debian/ sid main contrib non-free - -# official debian AT repository: -# deb http://ftp.at.debian.org/debian/ sid main contrib non-free -# deb-src http://ftp.at.debian.org/debian/ sid main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE index bd6c1b6..548e7ed 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE @@ -1,4 +1,4 @@ -# official debian repository (mirror selected via geo-ip): +# official debian repository: deb http://ftp.debian.org/debian/ squeeze main contrib non-free deb-src http://ftp.debian.org/debian/ squeeze main contrib non-free @@ -9,15 +9,3 @@ # backports: deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free deb-src http://backports.debian.org/debian-backports squeeze-backports main contrib non-free - -# official debian repository: -# deb http://ftp.debian.org/debian/ squeeze main contrib non-free -# deb-src http://ftp.debian.org/debian/ squeeze main contrib non-free - -# official debian DE repository: -# deb http://ftp.de.debian.org/debian/ squeeze main contrib non-free -# deb-src http://ftp.de.debian.org/debian/ squeeze main contrib non-free - -# official debian AT repository: -# deb http://ftp.at.debian.org/debian/ squeeze main contrib non-free -# deb-src http://ftp.at.debian.org/debian/ squeeze main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE index b956b3d..ec406a4 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE @@ -1,4 +1,4 @@ -# official debian repository (mirror selected via geo-ip): +# official debian repository: deb http://ftp.debian.org/debian/ stable main contrib non-free deb-src http://ftp.debian.org/debian/ stable main contrib non-free @@ -9,15 +9,3 @@ # backports: deb http://ftp.debian.org/debian/ jessie-backports main contrib non-free deb-src http://ftp.debian.org/debian/ jessie-backports main contrib non-free - -# official debian repository: -# deb http://ftp.debian.org/debian/ stable main contrib non-free -# deb-src http://ftp.debian.org/debian/ stable main contrib non-free - -# official debian DE repository: -# deb http://ftp.de.debian.org/debian/ stable main contrib non-free -# deb-src http://ftp.de.debian.org/debian/ stable main contrib non-free - -# official debian AT repository: -# deb http://ftp.at.debian.org/debian/ stable main contrib non-free -# deb-src http://ftp.at.debian.org/debian/ stable main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING index 9098384..0a51c94 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING @@ -1,19 +1,7 @@ -# official debian repository (mirror selected via geo-ip): +# official debian repository: deb http://ftp.debian.org/debian/ testing main contrib non-free deb-src http://ftp.debian.org/debian/ testing main contrib non-free # security updates: deb http://security.debian.org/ testing/updates main contrib deb-src http://security.debian.org/ testing/updates main contrib - -# official debian repository: -# deb http://ftp.debian.org/debian/ testing main contrib non-free -# deb-src http://ftp.debian.org/debian/ testing main contrib non-free - -# official debian DE repository: -# deb http://ftp.de.debian.org/debian/ testing main contrib non-free -# deb-src http://ftp.de.debian.org/debian/ testing main contrib non-free - -# official debian AT repository: -# deb http://ftp.at.debian.org/debian/ testing main contrib non-free -# deb-src http://ftp.at.debian.org/debian/ testing main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE index 5ae9775..1491bcb 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE @@ -1,15 +1,3 @@ -# official debian repository (mirror selected via geo-ip): +# official debian repository: deb http://ftp.debian.org/debian/ unstable main contrib non-free deb-src http://ftp.debian.org/debian/ unstable main contrib non-free - -# official debian repository: -# deb http://ftp.debian.org/debian/ unstable main contrib non-free -# deb-src http://ftp.debian.org/debian/ unstable main contrib non-free - -# official debian DE repository: -# deb http://ftp.de.debian.org/debian/ unstable main contrib non-free -# deb-src http://ftp.de.debian.org/debian/ unstable main contrib non-free - -# official debian AT repository: -# deb http://ftp.at.debian.org/debian/ unstable main contrib non-free -# deb-src http://ftp.at.debian.org/debian/ unstable main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY index bba9b9c..70655c9 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY @@ -1,4 +1,4 @@ -# official debian repository (mirror selected via geo-ip): +# official debian repository: deb http://ftp.debian.org/debian/ wheezy main contrib non-free deb-src http://ftp.debian.org/debian/ wheezy main contrib non-free @@ -9,15 +9,3 @@ # backports: deb http://ftp.debian.org/debian/ wheezy-backports main contrib non-free deb-src http://ftp.debian.org/debian/ wheezy-backports main contrib non-free - -# official debian repository: -# deb http://ftp.debian.org/debian/ wheezy main contrib non-free -# deb-src http://ftp.debian.org/debian/ wheezy main contrib non-free - -# official debian DE repository: -# deb http://ftp.de.debian.org/debian/ wheezy main contrib non-free -# deb-src http://ftp.de.debian.org/debian/ wheezy main contrib non-free - -# official debian AT repository: -# deb http://ftp.at.debian.org/debian/ wheezy main contrib non-free -# deb-src http://ftp.at.debian.org/debian/ wheezy main contrib non-free