X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=4b8e397bd5a939200567ffa007875d9b98344148;hb=c7467f022874eb62e0fde888f5fc089727b28a9e;hp=1d9aa20651b2eae035a0faa55b10c6bdce501d87;hpb=faec0ce87044e34a237407df7d81176611586e4b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 1d9aa2065..4b8e397bd 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -82,20 +82,14 @@ class buildd ($ensure=present) {
 			require => Package['debian.org']
 		}
 
-		if ($::kernel == 'Linux') {
-			package { 'python-psutil':
-				ensure => installed,
-			}
-			file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-				source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
-				mode    => '0555',
-			}
-		} else {
-			file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-				source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
-				mode    => '0555',
-			}
+		package { 'python-psutil':
+			ensure => installed,
 		}
+		file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+			source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
+			mode    => '0555',
+		}
+
 		file { '/etc/cron.d/puppet-buildd-aptitude': ensure => absent }
 		concat::fragment { 'dsa-puppet-stuff--buildd-aptitude-killer':
 			target => '/etc/cron.d/dsa-puppet-stuff',