X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=a5af7bedfde513a919df9bd730a046a0f2d51877;hb=bf6b1da5520ccce7b30b81e1f6cb0bb4619a48c2;hp=509d3356724c1c790108387f829c08047251dd67;hpb=b6577bf29c47fd9dff8f40aceb200a3f4431dc1a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 509d33567..a5af7bedf 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,5 +1,6 @@
 class buildd {
     package {
+        "schroot": ensure => installed;
         "sbuild": ensure => installed;
         "buildd": ensure => installed;
         "buildd-builder-meta": ensure => installed;
@@ -21,18 +22,27 @@ class buildd {
              notify  => Exec["apt-keys-update"],
              ;
         "/etc/schroot/mount-defaults":
-             source  => "puppet:///modules/buildd/mount-defaults",
+             content => template("buildd/etc/schroot/mount-defaults.erb"),
              require => Package["sbuild"]
              ;
         "/etc/cron.d/dsa-buildd":
              source => "puppet:///modules/buildd/cron.d-dsa-buildd",
-             require => Package["cron"]
+             require => Package["debian.org"]
              ;
         "/etc/dupload.conf":
              source => "puppet:///modules/buildd/dupload.conf",
              require => Package["dupload"]
              ;
+        "/etc/default/schroot":
+             source => "puppet:///modules/buildd/default-schroot",
+             require => Package["schroot"]
+             ;
+    }
+
+    case $kernel {
+        Linux: { linux_module { "dm_snapshot": ensure => present; } }
     }
+
 }
 # vim:set et:
 # vim:set sts=4 ts=4: