X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=79065a17c45a28aa501df88b96bc9c3ee90f3c4a;hb=6e991e41c587e8e276825afaa174d6420c1d4e9d;hp=0993a1dc08f112501be7c78c65c57bde31b3af83;hpb=3d2ebaca028f10080d65b693418fcded8d62ccb6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 0993a1dc0..79065a17c 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,6 +1,13 @@
 class buildd {
+
+	# sigh, sort this mess out, kids
+	if $::lsbdistcodename in [lenny,squeeze] {
+		package { 'schroot': ensure => installed }
+	} else {
+		package { 'schroot': ensure => held }
+	}
+
 	package { [
-			'schroot',
 			'sbuild',
 			'apt-transport-https',
 			'debootstrap',
@@ -10,6 +17,7 @@ class buildd {
 	}
 
 	site::linux_module { 'dm_snapshot': }
+	ferm::module { 'nf_conntrack_ftp': }
 
 	site::aptrepo { 'buildd':
 		ensure => absent,