summaryrefslogtreecommitdiff
path: root/templates/Ubuntu
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2015-09-20 23:27:18 +0200
committerkwadronaut <kwadronaut@leap.se>2015-09-20 23:27:18 +0200
commitab90d1d0fe9655d367c637e95dff59e4dbe2dd35 (patch)
tree482d3315aeb04ddea456b058bf9ba035bc01ef73 /templates/Ubuntu
parentfca103484ddc1f647a54135b6a902edabf459554 (diff)
parentcf4726e8452bf27498e15900cfde437314ecef67 (diff)
Merge remote-tracking branch 'shared-mod/master'
Conflicts: README
Diffstat (limited to 'templates/Ubuntu')
-rw-r--r--templates/Ubuntu/sources.list.erb12
1 files changed, 8 insertions, 4 deletions
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index 8d2585d..213f051 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -7,11 +7,13 @@ deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lre
deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %>
<% end -%>
+<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
# updates
deb <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
-<% if include_src -%>
+<% if include_src -%>
deb-src <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
-<% end -%>
+<% end
+ end -%>
# security suppport
deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
@@ -19,8 +21,10 @@ deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
<% end -%>
+<% if use_backports=scope.lookupvar('apt::use_backports') -%>
# backports
deb <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<% if include_src -%>
+<% if include_src -%>
deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<% end -%>
+<% end
+ end -%>