Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  revert RLimitMem for merkel altogether
  up the RLimitMem for hyperestraier
  voltaire doesn't need special handling anymore
  and the right path
  and quotes
  what could possibly go wrong

diff --git a/modules/buildd/files/cron.d-dsa-buildd b/modules/buildd/files/cron.d-dsa-buildd
index 9deb39f32a02586155389ab4dc41bc4ed40d7f80..bf9b12287fca145dbde11ff599360f834d898f1f 100644 (file)
--- a/modules/buildd/files/cron.d-dsa-buildd
+++ b/modules/buildd/files/cron.d-dsa-buildd
@@ -1 +1 @@
-@reboot buildd [ -f ~buildd/NO-DAEMON-PLEASE ] && grep 'delete-on-boot' ~buildd/NO-DAEMON-PLEASE > /dev/null && rm -f ~buildd/NO-DAEMON-PLEASE && buildd-watcher
+@reboot buildd [ -f ~buildd/NO-DAEMON-PLEASE ] && grep 'delete-on-boot' ~buildd/NO-DAEMON-PLEASE > /dev/null && rm -f ~buildd/NO-DAEMON-PLEASE && if [ -x ~buildd/.bootscript ]; then ~buildd/.bootscript; else buildd-watcher; fi