diff options
| author | Steven Chamberlain <steven@pyro.eu.org> | 2014-11-11 20:57:27 +0000 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-11-12 09:53:36 +0100 |
| commit | ebee7f048662b91f3153cfb8a7f5f890b2939966 (patch) | |
| tree | 4b82a13f8a20112dad34e643067d308e3eb1e300 | |
| parent | 7d8843e904cc3c57e10040bcd9b703bbd729974c (diff) | |
| download | jenkins.debian.net-ebee7f048662b91f3153cfb8a7f5f890b2939966.tar.xz | |
Move some vars earlier so they can be overridden
| -rw-r--r-- | bin/g-i-installation.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index fb8630df..83565fb2 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -189,6 +189,12 @@ bootstrap_system() { *_hurd*) ;; *) QEMU_OPTS="$QEMU_OPTS -enable-kvm -cpu host" ;; esac + QEMU_WEBSERVER=http://10.0.2.1/ + QEMU_NET_OPTS="-net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254" + # preseeding related variables + PRESEEDCFG="preseed.cfg" + PRESEED_PATH=d-i-preseed-cfgs + PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG" if [ -n "$IMAGE" ] ; then QEMU_OPTS="$QEMU_OPTS -cdrom $IMAGE -boot d" case $NAME in @@ -203,12 +209,7 @@ bootstrap_system() { else QEMU_KERNEL="--kernel $KERNEL --initrd $INITRD" fi - QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -m $RAMSIZE -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254" - QEMU_WEBSERVER=http://10.0.2.1/ - # preseeding related variables - PRESEEDCFG="preseed.cfg" - PRESEED_PATH=d-i-preseed-cfgs - PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG" + QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -m $RAMSIZE $QEMU_NET_OPTS" INST_LOCALE="locale=$DI_LOCALE" INST_KEYMAP="keymap=us" # always us! INST_VIDEO="video=vesa:ywrap,mtrr vga=788" |