summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Chamberlain <steven@pyro.eu.org>2014-11-14 13:14:39 +0000
committerHolger Levsen <holger@layer-acht.org>2014-11-14 14:24:20 +0100
commit17e80931ca4088a71ead9abd63c6ba07da269629 (patch)
treedacd122dc68ca0a6e16cf7b306140c3a2f286228
parentdbe8da10bdd06b71a339853ce3b77acc64a44deb (diff)
downloadjenkins.debian.net-17e80931ca4088a71ead9abd63c6ba07da269629.tar.xz
g-i: make PRESEED_URL contain just the URL itself!
-rw-r--r--bin/g-i-installation.sh4
1 files changed, 2 insertions, 2 deletions
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:"