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

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 5c0f36016..14bb91455 100644
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -33,6 +33,22 @@ 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',
+		source  => 'puppet:///modules/schroot/setup-dchroot',
+	}
+	file { '/usr/local/sbin/setup-all-dchroots':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/setup-all-dchroots',
+	}
 
 	file { '/etc/schroot/dsa':
 		ensure => directory,
@@ -53,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'],
+		}
+	}
 }