X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Fmanifests%2Finit.pp;h=14bb914552a96e150431fddbb165931681569ec8;hb=74b848186ff77f1247370d033d9e7e8806193317;hp=d9ca26141fe65f300a18eb4abb261754592718c5;hpb=c5e660a55fca2dea5359be4884693ccf2d0746cc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index d9ca26141..14bb91455 100644
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -33,6 +33,13 @@ class schroot {
 		source  => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-sources',
 		require => Package['schroot'],
 	}
+	if ($::lsbmajdistrelease >= 8) {
+		file { '/etc/schroot/setup.d/99builddsourceslist':
+			mode    => '0555',
+			source  => 'puppet:///modules/schroot/schroot-setup.d/99builddsourceslist',
+			require => Package['schroot'],
+		}
+	}
 
 	file { '/usr/local/sbin/setup-dchroot':
 		mode    => '0555',
@@ -62,4 +69,11 @@ class schroot {
 		content => template('schroot/schroot-buildd/fstab.erb'),
 		require => Package['schroot'],
 	}
+
+	if $has_srv_buildd {
+		file { '/etc/schroot/buildd/config':
+			content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack\n",
+			require => Package['schroot'],
+		}
+	}
 }