X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fetc%2Fapt%2Fsources.list.d%2Fvolatile.list.erb;h=af8fcb9c166d273c93fbfdcaa8197a0504b9f650;hb=f594cb25e68f559671190cf143d531196d19bd05;hp=7801d5356fa647847380be61d0dd4e7e03d8c023;hpb=66fa4885c845ab1bbfc24a468a354def9852758c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
index 7801d5356..af8fcb9c1 100644
--- a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
@@ -3,7 +3,6 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
-<% else %>
-deb     http://volatile.debian.org/debian-volatile lenny/volatile   main contrib non-free
+<% unless %w{lenny n/a}.include?(scope.lookupvar('::lsbdistcodename')) %>
+deb	http://ftp.debian.org/debian	<%= lsbdistcodename %>-updates		main contrib non-free
 <% end %>