Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  a dep on the unbound package from the dir means we only need to run puppet twice now
  document how to stop buildds Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  init scripts like arguments, like... start Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index b80e66c..829e8eb 100644 (file)
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -1,6 +1,14 @@
 
 # Upgrade from lenny to squeeze
 
+on buildds:
+
+       cd ~buildd
+       sudo su - buildd
+       touch NO-DAEMON-PLEASE EXIT-DAEMON-PLEASE && exit
+
+       now wait for the buildd to quit
+
 turn off samhain
 
        /etc/init.d/samhain stop &&
@@ -70,7 +78,7 @@ update dsa-puppet.git (add to squeeze list in local.yaml)
 
 do a puppet run:
 
-       puppetd -t; puppetd -t; puppetd -t
+       puppetd -t; puppetd -t
 
 upgrade once more (security etc)
 
@@ -139,7 +147,7 @@ re-enable exim, samhain
        mv /etc/rc2.d/K02exim4 /etc/rc2.d/S02exim4
        mv /etc/rc2.d/K02samhain /etc/rc2.d/S02samhain
        env -i /etc/init.d/exim4 start
-       env -i /etc/init.d/samhain
+       env -i /etc/init.d/samhain start
 
        insserv