From 2a426491d3290009cdbfa9608ebc843d7b1ce59f Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 27 Nov 2014 01:35:48 +0100 Subject: g-i speakup: Add a sound card --- bin/g-i-installation.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 320d5a9b..8ffd78b5 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -306,6 +306,7 @@ bootstrap_system() { ;; *_speakup) EXTRA_APPEND="$EXTRA_APPEND speakup.synth=soft" + QEMU_OPTS="$QEMU_OPTS -soundhw ac97" ;; *_presentation) EXTRA_APPEND="$EXTRA_APPEND url=hands.com classes=talks/fosdem07" -- cgit v1.2.3-70-g09d2 From 49cf3852a9785b072512f7b7322e8e8db3366274 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 27 Nov 2014 13:15:05 +0100 Subject: g-i: presentation mode tests: press enter more often --- bin/g-i-installation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 8ffd78b5..19843186 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -458,7 +458,7 @@ presentation_boot() { let MY_NR=NR-TRIGGER_NR TOKEN=$(printf "%04d" $MY_NR) case $TOKEN in - 0[123456]00) do_and_report key enter + [01][123456789]00) do_and_report key enter ;; *) ;; esac -- cgit v1.2.3-70-g09d2 From 9b51c10d098acb2c257ad73d243b8bb20a718414 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 27 Nov 2014 16:14:51 +0100 Subject: g-i: Use different pixel threshold for d-i and desktop d-i doesn't have any clockish thing, and its text interface doesn't change much while progressing, thus needing a small threshold The LXDE desktop, on the other hand, has by default a CPU meter and clock, which needs a bigger threshold. --- bin/g-i-installation.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 19843186..15cf2be7 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -1026,6 +1026,11 @@ monitor_system() { else TIMEOUT=$3 fi + if [ -z "$4" ] ; then + PIXELDIFF=100 + else + PIXELDIFF=$4 + fi cd $RESULTS sleep 4 # chosen by fair dice roll hourlimit=16 # hours @@ -1108,18 +1113,18 @@ monitor_system() { let OLD=NR-$TIMEOUT PRINTF_OLD=$(printf "%06d" $OLD) # test if this screenshot is basically the same as the one $TIMEOUT screenshots ago - # 400 pixels difference between to images is tolerated, to ignore updating clocks + # $PIXELDIFF pixels difference between to images is tolerated, to ignore updating clocks PIXEL=$(compare -metric AE snapshot_${PRINTF_NR}.png snapshot_${PRINTF_OLD}.png /dev/null 2>&1 || true ) # usually this returns an integer, but not always.... if [[ "$PIXEL" =~ ^[0-9]+$ ]] ; then echo "$PIXEL pixel difference between snapshot_${PRINTF_NR}.png and snapshot_${PRINTF_OLD}.png" - if [ $PIXEL -lt 400 ] ; then + if [ $PIXEL -lt $PIXELDIFF ] ; then SAME=Y for INTER in $(seq $OLD 10 $NR); do PRINTF_INTER=$(printf "%06d" $INTER) PIXEL=$(compare -metric AE snapshot_${PRINTF_NR}.png snapshot_${PRINTF_INTER}.png /dev/null 2>&1 || true ) if [[ "$PIXEL" =~ ^[0-9]+$ ]] ; then - if [ $PIXEL -ge 400 ] ; then + if [ $PIXEL -ge $PIXELDIFF ] ; then echo "but $PIXEL difference between snapshot_${PRINTF_NR}.png and snapshot_${PRINTF_INTER}.png" SAME=N break @@ -1320,9 +1325,9 @@ case $NAME in ;; *_presentation) monitor_system presentation 10 ;; - debian-edu_*combi-server) monitor_system install wait4match 3000 + debian-edu_*combi-server) monitor_system install wait4match 3000 100 ;; - debian-edu_*wheezy*standalone*) monitor_system install wait4match 1200 + debian-edu_*wheezy*standalone*) monitor_system install wait4match 1200 100 ;; *) monitor_system install wait4match ;; @@ -1354,7 +1359,7 @@ case $NAME in *) let START_TRIGGER=NR+200 ;; esac - monitor_system post_install $START_TRIGGER + monitor_system post_install $START_TRIGGER 600 1000 esac cleanup_all -- cgit v1.2.3-70-g09d2