diff options
| author | Holger Levsen <holger@layer-acht.org> | 2012-12-28 00:27:13 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2012-12-28 00:27:13 +0100 |
| commit | 89e52309b371fc66bfcfa1bad69073ff078b2d1e (patch) | |
| tree | f15a86d317ba8f404e9aed1659bb0a37c262ee1b | |
| parent | b4888d3a1dc349fc9f0972ed78814da759fba0cb (diff) | |
| download | jenkins.debian.net-89e52309b371fc66bfcfa1bad69073ff078b2d1e.tar.xz | |
finally fix installation problems, hopefully
| -rwxr-xr-x | bin/g-i-installation.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 4b57a8bc..3c8cc7d2 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -412,7 +412,7 @@ monitor_system() { PRINTF_OLD=$(printf "%06d" $OLD) # test if this screenshot is basically the same as the one 400 screenshots ago # 200 pixels difference between to images is tolerated, to ignore updating clocks - PIXEL=$(compare -metric AE snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm /dev/null 2>&1) + PIXEL=$(compare -metric AE snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm /dev/null 2>&1 || echo 100000) echo "$PIXEL pixel difference between snapshot_${PRINTF_NR}.ppm and snapshot_${PRINTF_OLD}.ppm" if [ $PIXEL -lt 200 ] ; then set -x @@ -532,8 +532,7 @@ case $NAME in mkdir -p $RESULTS/log/installer touch $RESULTS/log/dummy $RESULTS/log/installer/dummy ;; - *) set -x - # + *) # # kill qemu and image # sudo kill -9 $(ps fax | grep [q]emu-system | grep vnc=$DISPLAY 2>/dev/null | awk '{print $1}') || true |