Ubuntu templates: make sources.list consistent with ISO installs.

This modifies a designed decision to have trimmer sources.list than
one would find on a server iso install.   Specifically, here we now
enable: restricted and multiverse and backports.

LP: #1177432

2 files changed, 19 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 5fbfaccc..ea25cb69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,8 @@
  - ubuntu fan: support for config and installing of ubuntu fan (LP: #1504604)
  - Azure: support extracting SSH key values from ovf-env.xml (LP: #1506244)
  - AltCloud: fix call to udevadm settle (LP: #1507526)
+ - Ubuntu templates: modify sources.list template to provide same sources
+   as install from server or desktop ISO. (LP: #1177432)
 0.7.6:
  - open 0.7.6
  - Enable vendordata on CloudSigma datasource (LP: #1303986)
diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl
index 3fec51d3..59ae089b 100644
--- a/templates/sources.list.ubuntu.tmpl
+++ b/templates/sources.list.ubuntu.tmpl
@@ -9,13 +9,13 @@
 
 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
 # newer versions of the distribution.
-deb {{mirror}} {{codename}} main
-deb-src {{mirror}} {{codename}} main
+deb {{mirror}} {{codename}} main restricted
+deb-src {{mirror}} {{codename}} main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb {{mirror}} {{codename}}-updates main
-deb-src {{mirror}} {{codename}}-updates main
+deb {{mirror}} {{codename}}-updates main restricted
+deb-src {{mirror}} {{codename}}-updates main restricted
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
@@ -26,31 +26,29 @@ deb {{mirror}} {{codename}}-updates universe
 deb-src {{mirror}} {{codename}}-updates universe
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
-## team, and may not be under a free licence. Please satisfy yourself as to
+## team, and may not be under a free licence. Please satisfy yourself as to 
 ## your rights to use the software. Also, please note that software in 
 ## multiverse WILL NOT receive any review or updates from the Ubuntu
 ## security team.
-# deb {{mirror}} {{codename}} multiverse
-# deb-src {{mirror}} {{codename}} multiverse
-# deb {{mirror}} {{codename}}-updates multiverse
-# deb-src {{mirror}} {{codename}}-updates multiverse
+deb {{mirror}} {{codename}} multiverse
+deb-src {{mirror}} {{codename}} multiverse
+deb {{mirror}} {{codename}}-updates multiverse
+deb-src {{mirror}} {{codename}}-updates multiverse
 
 ## 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.
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
-deb {{mirror}} {{codename}}-backports main
-deb-src {{mirror}} {{codename}}-backports main
-deb {{mirror}} {{codename}}-backports universe
-deb-src {{mirror}} {{codename}}-backports universe
+#deb {{mirror}} {{codename}}-backports main restricted universe multiverse
+#deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse
 
-## Uncomment the following two to add software from the 'backports'
-## multiverse and restricted repositories.
-# deb {{mirror}} {{codename}}-backports multiverse
-# deb-src {{mirror}} {{codename}}-backports multiverse
-# deb {{mirror}} {{codename}}-backports restricted
-# deb-src {{mirror}} {{codename}}-backports restricted
+deb {{security}} {{codename}}-security main restricted
+deb-src {{security}} {{codename}}-security main restricted
+deb {{security}} {{codename}}-security universe
+deb-src {{security}} {{codename}}-security universe
+deb {{security}} {{codename}}-security multiverse
+deb-src {{security}} {{codename}}-security multiverse
 
 ## Uncomment the following two lines to add software from Canonical's
 ## 'partner' repository.
@@ -58,10 +56,3 @@ deb-src {{mirror}} {{codename}}-backports universe
 ## respective vendors as a service to Ubuntu users.
 # deb http://archive.canonical.com/ubuntu {{codename}} partner
 # deb-src http://archive.canonical.com/ubuntu {{codename}} partner
-
-deb {{security}} {{codename}}-security main
-deb-src {{security}} {{codename}}-security main
-deb {{security}} {{codename}}-security universe
-deb-src {{security}} {{codename}}-security universe
-# deb {{security}} {{codename}}-security multiverse
-# deb-src {{security}} {{codename}}-security multiverse