ssh in a while loop really wants -n

diff --git a/config/debian/common b/config/debian/common
index ee762f239dceeef279b56630cf210f37a853e0a0..bb6f8e4a0b28465dca9031f8e70248a9aa613c7a 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -24,7 +24,7 @@ function debug () {
 }
 
 function wbtrigger() {
-    SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240"
+    SSHOPT="-n -o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240"
     if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then
         ssh -q -q ${SSHOPT} wbadm@buildd /srv/wanna-build/trigger.often
     fi

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index be7413a4ca25c161618d631569e3a32f0c49f594..09e9c9b10a2844e76f8fa5fffe7ca2d3df26573b 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -224,7 +224,7 @@ while read FUNC ARGS TIME ERR BACKGROUND; do
     esac
 done < <(cat - <<EOF
 savetimestamp          none                       none                       false   false
-qa1                    none                       init                       false   true
+qa1                    none                       init                       true    true
 pg_timestamp           predinstall                pg_dump1                   false   false
 updates                none                       External\ Updates          false   false
 i18n1                  none                       i18n\ 1                    false   false

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index a11c75e3049332c826b6b2e88daa222600aaaf26..b8a4b0eb44ccb998dbca0c6bab187cb8db3fcc31 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -56,7 +56,7 @@ function onerror() {
 # pushing merkels QA user, part one
 function qa1() {
     log "Telling QA user that we start dinstall"
-    ssh -2 -i ~dak/.ssh/push_merkel_qa  -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@qa.debian.org sleep 1
+    ssh -n -2 -i ~dak/.ssh/push_merkel_qa  -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@qa.debian.org sleep 1
 }
 
 # Updating various files