cloud-init-dev team mailing list archive

[Joonas Kylmälä <j.kylmala@xxxxxxxxx>]

Joonas Kylmälä has proposed merging ~j.kylmala/cloud-init:disable-proprietary-repositories into cloud-init:master.

Commit message:
Remove non-free repositories from Debian template.

The Debian GNU/Linux distribution doesn't come offically with the
non-free repositories enabled. Therefore, we want to disable those in
the cloud-init template.

LP: #1700091

Requested reviews:
  cloud-init commiters (cloud-init-dev)
Related bugs:
  Bug #1700091 in cloud-init: "Non-free repositories enabled"
  https://bugs.launchpad.net/cloud-init/+bug/1700091

For more details, see:
https://code.launchpad.net/~j.kylmala/cloud-init/+git/cloud-init/+merge/329286
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~j.kylmala/cloud-init:disable-proprietary-repositories into cloud-init:master.

diff --git a/templates/sources.list.debian.tmpl b/templates/sources.list.debian.tmpl
index d64ace4..e7ef9ed 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