From f3845465d97e8ce0fa0aca9b9182e838da99c753 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 12 Dec 2012 14:34:14 +0100 Subject: it's _preseed.cfg now --- 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 71668ff1..eb2612f1 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -84,7 +84,7 @@ cleanup_all() { # # kill qemu and image # - sudo kill -9 $(ps fax | grep [q]emu-system | grep ${NAME}-preseed.cfg 2>/dev/null | awk '{print $1}') || true + sudo kill -9 $(ps fax | grep [q]emu-system | grep ${NAME}_preseed.cfg 2>/dev/null | awk '{print $1}') || true sleep 0.3s rm $WORKSPACE/$NAME.raw # @@ -117,7 +117,7 @@ bootstrap() { QEMU_WEBSERVER=http://10.0.2.2/ # preseeding related variables PRESEED_PATH=d-i-preseed-cfgs - PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}-preseed.cfg" + PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_preseed.cfg" INST_LOCALE="locale=en_US" INST_KEYMAP="keymap=us" INST_VIDEO="video=vesa:ywrap,mtrr vga=788" @@ -139,7 +139,7 @@ bootstrap() { ;; esac APPEND="auto=true priority=critical $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP $PRESEED_URL $INST_VIDEO -- quiet" - show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}-preseed.cfg + show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}_preseed.cfg echo echo "Starting QEMU_ now:" (sudo qemu-system-x86_64 \ -- cgit v1.2.3-70-g09d2