X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fschroot%2Fmanifests%2Finit.pp;h=14bb914552a96e150431fddbb165931681569ec8;hb=43399d5ea3021906158f39a3bd3bda728b00947d;hp=1716fbbed93979480d5d7a6ea7742feee9bfd1ab;hpb=2d41a8963f7303b6a78a5432658ce7e93b145cce;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 1716fbbed..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',
@@ -65,7 +72,7 @@ class schroot {
 
 	if $has_srv_buildd {
 		file { '/etc/schroot/buildd/config':
-			content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack",
+			content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack\n",
 			require => Package['schroot'],
 		}
 	}