summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorroot <root@puppet.nadir.org>2011-02-16 13:23:54 +0000
committerroot <root@puppet.nadir.org>2011-02-16 13:23:54 +0000
commit13033f7d814fe6c006d47108b5df5e0505975010 (patch)
tree733eafc4279e0c621b620a335f550d616402419e /templates
parent44c6d6aa8f394b0acf72a26ebb185595fe451159 (diff)
parent840ea9ed9d3e0a26e5a70db2143ebb3f0fea13b4 (diff)
Merge branch 'master' of git://labs.riseup.net/shared-apt
Diffstat (limited to 'templates')
-rw-r--r--templates/Debian/preferences_squeeze.erb9
-rw-r--r--templates/Debian/sources.list.erb14
2 files changed, 21 insertions, 2 deletions
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb
index f21562d..5e15d27 100644
--- a/templates/Debian/preferences_squeeze.erb
+++ b/templates/Debian/preferences_squeeze.erb
@@ -3,14 +3,19 @@ Package: *
Pin: release o=Debian,n=<%= codename %>
Pin-Priority: 990
+Explanation: Debian <%= codename %>-updates
+Package: *
+Pin: release o=Debian,n=<%= codename %>-updates
+Pin-Priority: 990
+
Explanation: Debian backports
Package: *
Pin: origin backports.debian.org
Pin-Priority: 200
-Explanation: Debian wheezy
+Explanation: Debian <%= next_codename %>
Package: *
-Pin: release o=Debian,n=wheezy
+Pin: release o=Debian,n=<%= next_codename %>
Pin-Priority: 2
Explanation: Debian sid
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index f2e8fd8..3a810e3 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -34,10 +34,17 @@ deb-src <%= backports_url %> <%= codename %>-backports <%= repos %>
<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
# There is no volatile archive for <%= release %>
<% else -%>
+<% if (codename == "lenny" || codename == "etch") -%>
deb <%= volatile_url %> <%= codename %>/volatile <%= repos %>
<% if include_src then -%>
deb-src <%= volatile_url %> <%= codename %>/volatile <%= repos %>
<% end -%>
+<% else -%>
+deb <%= debian_url %> <%= codename %>-updates <%= repos %>
+<% if include_src then -%>
+deb-src <%= debian_url %> <%= codename %>-updates <%= repos %>
+<% end -%>
+<% end -%>
<% end -%>
<% end -%>
@@ -75,10 +82,17 @@ deb-src <%= backports_url %> <%= next_codename %>-backports <%= repos %>
<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
# There is no volatile archive for <%= next_release %>
<% else -%>
+<% if (next_codename == "lenny" || next_codename == "etch") -%>
deb <%= volatile_url %> <%= next_codename %>/volatile <%= repos %>
<% if include_src then -%>
deb-src <%= volatile_url %> <%= next_codename %>/volatile <%= repos %>
<% end -%>
+<% else -%>
+deb <%= debian_url %> <%= next_codename %>-updates <%= repos %>
+<% if include_src then -%>
+deb-src <%= debian_url %> <%= next_codename %>-updates <%= repos %>
+<% end -%>
+<% end -%>
<% end -%>
<% end -%>
<% end -%>