From 90fff5f1bd9e20d86f5945c353e4662de5694344 Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Thu, 13 Nov 2014 13:41:27 +0000
Subject: g-i: try to stop qemu with SIGINT before SIGKILL

---
 bin/g-i-installation.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'bin/g-i-installation.sh')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 60223bdf..45bc0a87 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -109,7 +109,16 @@ cleanup_all() {
 	#
 	# kill qemu
 	#
-	sudo kill -9 $(ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " 2>/dev/null | awk '{print $1}') || true
+	# use SIGINT for 10 seconds to encourage graceful shutdown
+	for i in $(seq 1 10); do
+		QEMU_PID=$(ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " 2>/dev/null | awk '{print $1}')
+		[ -z "$QEMU_PID" ] && break
+		sudo kill -INT $QEMU_PID
+		sleep 1
+	done
+	# force exit with SIGKILL if still running now
+	QEMU_PID=$(ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " 2>/dev/null | awk '{print $1}')
+	[ -z "$QEMU_PID" ] || sudo kill -KILL $QEMU_PID
 	sleep 0.3s
 	#
 	# save logs if there are any
-- 
cgit v1.2.3-70-g09d2


From f379e3c01c7f351985778d4b2d9ba57fd13e6c71 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 14:07:33 +0100
Subject: g-i-i: remove workaround for hurd as it's not that slow anymore

---
 bin/g-i-installation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/g-i-installation.sh')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 45bc0a87..a3e940f0 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -1257,7 +1257,7 @@ case $NAME in
 			;;
 	debian-edu_*combi-server)		monitor_system install wait4match 3000
 			;;
-	*_hurd*|debian-edu_*wheezy*standalone*)		monitor_system install wait4match 1200
+	debian-edu_*wheezy*standalone*)		monitor_system install wait4match 1200
 			;;
 	*)		monitor_system install wait4match
 			;;
-- 
cgit v1.2.3-70-g09d2


From dbe8da10bdd06b71a339853ce3b77acc64a44deb Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 14:16:33 +0100
Subject: g-i-i: edu main server: log in sooner

---
 bin/g-i-installation.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin/g-i-installation.sh')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index a3e940f0..ebb1d1a5 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -720,11 +720,11 @@ post_install_boot() {
 							;;
 						0350)	do_and_report type root
 							;;
-						0480)	do_and_report key enter
+						0400)	do_and_report key enter
 							;;
-						0490)	do_and_report type r00tme
+						0410)	do_and_report type r00tme
 							;;
-						0500)	do_and_report key enter
+						0420)	do_and_report key enter
 							;;
 						0550)	do_and_report type ps
 							;;
-- 
cgit v1.2.3-70-g09d2


From 17e80931ca4088a71ead9abd63c6ba07da269629 Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Fri, 14 Nov 2014 13:14:39 +0000
Subject: g-i: make PRESEED_URL contain just the URL itself!

---
 bin/g-i-installation.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin/g-i-installation.sh')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index ebb1d1a5..356abed6 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -206,7 +206,7 @@ bootstrap_system() {
 	# preseeding related variables
 	PRESEEDCFG="preseed.cfg"
 	PRESEED_PATH=d-i-preseed-cfgs
-	PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG"
+	PRESEED_URL="$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG"
 	#
 	# boot configuration
 	#
@@ -309,7 +309,7 @@ bootstrap_system() {
 		EXTRA_APPEND="$EXTRA_APPEND priority=critical"
 		;;
 	esac
-	APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP $PRESEED_URL $INST_VIDEO -- quiet"
+	APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP url=$PRESEED_URL $INST_VIDEO -- quiet"
 	show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}_$PRESEEDCFG
 	echo
 	echo "Starting QEMU now:"
-- 
cgit v1.2.3-70-g09d2


From 28d563df14839706b2e471eb511fb86184904e17 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 15:41:21 +0100
Subject: get rid off harmless but confusing error message

---
 bin/g-i-installation.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'bin/g-i-installation.sh')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 356abed6..660198be 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -187,7 +187,9 @@ bootstrap_system() {
 	RELEASE="$(echo $NAME | cut -d "_" -f2)"
 	if [ "$RELEASE" != "jessie" ] ; then
 		echo "Workaround to remove swap signature from previous installs, see #757818"
-		time sudo dd if=/dev/zero of=$LV bs=4096 || true
+		bs=8192
+		let count="1024*1024*1024*$LV/$bs"
+		time sudo dd if=/dev/zero of=$LV bs=$bs count=$count  || true
 	else
 		echo "Release $RELEASE detected, where #757818 should be fixed, thus not applying workaround..."
 	fi
-- 
cgit v1.2.3-70-g09d2


From 8f0ba0d6b31bb80cfa2b193716ddb61802e6db11 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 16:12:03 +0100
Subject: g-i: fixup 28d563df, thanks Steven

---
 bin/g-i-installation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/g-i-installation.sh')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 660198be..9740f71e 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -188,7 +188,7 @@ bootstrap_system() {
 	if [ "$RELEASE" != "jessie" ] ; then
 		echo "Workaround to remove swap signature from previous installs, see #757818"
 		bs=8192
-		let count="1024*1024*1024*$LV/$bs"
+		let count="1024*1024*1024*${DISKSIZE_IN_GB}/$bs"
 		time sudo dd if=/dev/zero of=$LV bs=$bs count=$count  || true
 	else
 		echo "Release $RELEASE detected, where #757818 should be fixed, thus not applying workaround..."
-- 
cgit v1.2.3-70-g09d2


From 482759027ef8d95220176184301191b1b942c9f3 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 17 Nov 2014 18:48:31 +0100
Subject: g-i hurd: remove hardcoded alt-f4 simulation

now that we have the serial log
---
 bin/g-i-installation.sh | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'bin/g-i-installation.sh')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 9740f71e..74355978 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -1120,10 +1120,6 @@ monitor_system() {
 		if [ ! -z "$TRIGGER_MODE" ] && [ "$TRIGGER_MODE" = "$NR" ] ; then
 			let TRIGGER_NR=NR
 		fi
-		# find out why hurd hangs
-		if [ $NR -eq 5100 ] && [[ "$NAME" =~ ^debian.*_hurd.*$ ]] ; then
-			do_and_report key alt-f4
-		fi
 		let NR=NR+1
 		sleep 2
 	done
-- 
cgit v1.2.3-70-g09d2