[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#865611: non-free repositories are enabled by default

Joonas Kylmälä:
> I'm pretty confident with the modifications to
> "sources.list.debian.tmpl" but for "sources.list.ubuntu.tmpl" I would
> like to get your opinions on how to edit it. The official Ubuntu
> 17.04 with default installation appears to be enabled with main,
> restricted, universe, multiverse repositories.

Hmm, I thought about this for a few moments more. As Ubuntu distribution
includes non-free software repositories why would we go to change now
with cloud-init tool how the Ubuntu distribution should be? The template
file that is at the moment made for Ubuntu resembles in my opinion well
the Ubuntu distribution (actually looks like it might be exactly the
same), so maybe we shouldn't change it. It would be of course nice if it
would be only free software. Therefore, I attached now the revised
version of the patch that only removes non-free software from Debian.
>From c289a5e64dbbf0d226f91a31e19a8fe8c33baa9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@iki.fi>
Date: Fri, 23 Jun 2017 18:04:14 +0200
Subject: [PATCH] Remove proprietary repositories from template (Closes:

 templates/sources.list.debian.tmpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/sources.list.debian.tmpl b/templates/sources.list.debian.tmpl
index f4188c73..f9725a80 100644
--- a/templates/sources.list.debian.tmpl
+++ b/templates/sources.list.debian.tmpl
@@ -10,15 +10,15 @@
 # See http://www.debian.org/releases/stable/i386/release-notes/ch-upgrading.html
 # for how to upgrade to newer versions of the distribution.
-deb {{mirror}} {{codename}} main contrib non-free
-deb-src {{mirror}} {{codename}} main contrib non-free
+deb {{mirror}} {{codename}} main
+deb-src {{mirror}} {{codename}} main
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb {{security}} {{codename}}/updates main contrib non-free
-deb-src {{security}} {{codename}}/updates main contrib non-free
-deb {{mirror}} {{codename}}-updates main contrib non-free
-deb-src {{mirror}} {{codename}}-updates main contrib non-free
+deb {{security}} {{codename}}/updates main
+deb-src {{security}} {{codename}}/updates main
+deb {{mirror}} {{codename}}-updates main
+deb-src {{mirror}} {{codename}}-updates main
 ## Uncomment the following two lines to add software from the 'backports'
 ## repository.
@@ -26,5 +26,5 @@ deb-src {{mirror}} {{codename}}-updates main contrib non-free
 ## N.B. software from this repository may not have been tested as
 ## extensively as that contained in the main release, although it includes
 ## newer versions of some applications which may provide useful features.
-# deb {{mirror}} {{codename}}-backports main contrib non-free
-# deb-src {{mirror}} {{codename}}-backports main contrib non-free
+# deb {{mirror}} {{codename}}-backports main
+# deb-src {{mirror}} {{codename}}-backports main

Reply to: