From: Peter Palfrader Date: Mon, 23 Nov 2009 19:39:29 +0000 (+0100) Subject: If ~buildd.bootscript is executeable, run it instead of running buildd-watcher on... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c6e9a2218f11401f50e2a8a8523b3ff61aba6826;p=mirror%2Fdsa-puppet.git If ~buildd.bootscript is executeable, run it instead of running buildd-watcher on clean boot with delete-on-boot --- diff --git a/modules/buildd/files/cron.d-dsa-buildd b/modules/buildd/files/cron.d-dsa-buildd index 9deb39f32..bf9b12287 100644 --- 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