diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-11-07 09:53:29 +0000 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-11-07 09:53:29 +0000 |
| commit | 4ec97ef52ce5c71e102d7bc10268de1ea71ffdde (patch) | |
| tree | dfa282f79062a1e8e3a7be7a29460ee3129b16b5 | |
| parent | d6ba6d03eac039207cb20707e05f8686cd693561 (diff) | |
| download | jenkins.debian.net-4ec97ef52ce5c71e102d7bc10268de1ea71ffdde.tar.xz | |
g-i: (for now) use same network settings for all systems (again)
| -rw-r--r-- | bin/g-i-installation.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index c9618274..bf5d2447 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -115,7 +115,7 @@ cleanup_all() { # remove lvm volume # case $NAME in - # *standalone_mate) echo "Warning: not deleting lvm volume $LV" + # *jessie_main-server) echo "Warning: not deleting lvm volume $LV" # ;; *) sudo lvremove -f $LV ;; @@ -218,9 +218,8 @@ bootstrap_system() { debian_*_rescue*) EXTRA_APPEND="$EXTRA_APPEND rescue/enable=true" ;; - debian-edu*-server) + debian-edu_*ltsp-server|debian-edu_*combi-server) QEMU_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1" - EXTRA_APPEND="$EXTRA_APPEND interface=eth1" ;; *) ;; esac @@ -290,11 +289,12 @@ boot_system() { exit 1 fi QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -m $RAMSIZE" + QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254" case $NAME in - debian-edu*main-server|debian-edu*combi-server) - QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0,host=10.0.0.1,dhcpstart=10.0.2.2,dns=10.0.1.1 -net nic,vlan=1 -net user,vlan=1 --append interface=eth1" + debian-edu_*ltsp-server|debian-edu_*combi-server) + QEMU_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1" ;; - *) QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254" + *) ;; esac echo |