diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-02-07 13:14:14 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-02-07 13:14:14 +0100 |
| commit | 7ee6af04e39cc153034f3418337513ddf505ce5d (patch) | |
| tree | 42532ac7dd4b1e2bd6b980aec012051c33850334 /bin/g-i-installation.sh | |
| parent | 225d899572f626a6c6a9e1724af0b23c555e3f82 (diff) | |
| download | jenkins.debian.net-7ee6af04e39cc153034f3418337513ddf505ce5d.tar.xz | |
g-i: download preseed file from 127.0.0.1 from the jenkins job (and from 10.0.2.1 from inside qemu) but show jenkins.debian.net in output, so the url from the outside world
Diffstat (limited to 'bin/g-i-installation.sh')
| -rwxr-xr-x | bin/g-i-installation.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index f878a51e..f3100d7b 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012-2014 Holger Levsen <holger@layer-acht.org> +# Copyright 2012-2015 Holger Levsen <holger@layer-acht.org> # released under the GPLv=2 DEBUG=false @@ -173,10 +173,12 @@ cleanup_all() { } show_preseed() { - url="$1" - echo "Preseeding from $url:" + qemu_url="$1" + jenkins_url="$(echo $url|sed -s 's#10\.0\.2\.1#127.0.0.1#g')" + outside_url="$(echo $url|sed -s 's#10\.0\.2\.1#jenkins.debian.net#g')" + echo "Preseeding from $outside_url:" echo - curl -s "$url" | grep -v ^# | grep -v "^$" + curl -s "$jenkins_url" | grep -v ^# | grep -v "^$" } bootstrap_system() { @@ -326,7 +328,7 @@ bootstrap_system() { APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP url=$PRESEED_URL $INST_VIDEO -- quiet" ;; esac - show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}_$PRESEEDCFG + show_preseed $QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG echo echo "Starting QEMU now:" QEMU_LAUNCHER=$(mktemp) |