buildd-reboot: change shutdown time to 1 minute from 15

diff --git a/buildd-reboot b/buildd-reboot
index dc45094b71ad242a4bca922882536f60d283e76f..3ba1f045b6a8b43216574ab237c8a8f094b18c8a 100755 (executable)
--- a/buildd-reboot
+++ b/buildd-reboot
@@ -83,9 +83,9 @@ buildd_wait_and_reboot() {
                sudo -u buildd sh -c 'echo delete-on-boot > ~buildd/NO-DAEMON-PLEASE'
        fi
        if [ "$halt" = 1 ]; then
-               /sbin/shutdown -h 15 "$reason"
+               /sbin/shutdown -h 1 "$reason"
        else
-               /sbin/shutdown -r 15 "$reason"
+               /sbin/shutdown -r 1 "$reason"
        fi
 }
 

diff --git a/debian/changelog b/debian/changelog
index 0c7084541a57709f59501498c061d77b2d837314..5639273be2514a2ba5fd62bef92b0daee1f12030 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ debian.org (36) stable; urgency=low
 
   * buildd.debian.org:
     - depend on db4.8-util instead of 4.7.
+  * buildd-reboot: change shutdown time to 1 minute from 15.
 
- -- Peter Palfrader <weasel@debian.org>  Mon, 14 Jun 2010 17:52:55 +0200
+ -- Peter Palfrader <weasel@debian.org>  Mon, 14 Jun 2010 17:53:41 +0200
 
 debian.org (35) stable; urgency=low