buildd: throw out chroots on reboot

diff --git a/modules/buildd/files/default-schroot b/modules/buildd/files/default-schroot
new file mode 100644 (file)
index 0000000..b4131da
--- /dev/null
+++ b/modules/buildd/files/default-schroot
@@ -0,0 +1,16 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+# This is a configuration file for /etc/init.d/schroot; it allows you
+# to perform common modifications to the behavior of schroot
+# initialization without editing the init script (and thus getting
+# prompted by dpkg on upgrades).  Note that the defaults defined here
+# are not used when invoking the schroot command; to configure schroot
+# behaviour have a look at /etc/schroot/* and the schroot manual page
+# ("man schroot").
+
+# What do we want to do with "orphan" sessions when starting or
+# restarting?  Recover them (leave empty or set to "recover") or just
+# end them (set to "end")?
+SESSIONS_RECOVER="end"

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index da89852a37843244a3612dff7fbbccd1759b28c7..049925320e57bebd810e12ddccaf6228dee77011 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -32,6 +32,10 @@ class buildd {
              source => "puppet:///modules/buildd/dupload.conf",
              require => Package["dupload"]
              ;
+        "/etc/default/schroot":
+             source => "puppet:///modules/buildd/default-schroot",
+             require => Package["schroot"]
+             ;
     }
 
     case $kernel {