diff options
| author | Holger Levsen <holger@layer-acht.org> | 2013-02-09 15:06:23 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2013-02-09 15:06:23 +0100 |
| commit | 6642fd4a641853a1be8bd7d4df996d6976cb8b30 (patch) | |
| tree | 586e2023bb481b692e809ad152ba05185e75ce2e /bin | |
| parent | b60aa0a273fcde2008b6225b3e5ce98a29e369f4 (diff) | |
| download | jenkins.debian.net-6642fd4a641853a1be8bd7d4df996d6976cb8b30.tar.xz | |
add debian-edu main-server jobs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/g-i-installation.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 271da6cb..09894bf3 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -163,7 +163,7 @@ bootstrap_system() { debian_*_rescue*) EXTRA_APPEND="$EXTRA_APPEND rescue/enable=true" ;; - debian-edu*_combi-server) + debian-edu*-server) QEMU_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1" EXTRA_APPEND="$EXTRA_APPEND interface=eth0" ;; @@ -212,7 +212,7 @@ boot_system() { exit 1 fi case $NAME in - debian-edu*_combi-server) + debian-edu*-server) QEMU_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1" ;; *) ;; @@ -650,7 +650,7 @@ save_logs() { case $NAME in debian-edu_*_workstation) sudo guestmount -a $NAME.raw -m /dev/vg_system/root --ro $SYSTEM_MNT || ( echo "Warning: cannot mount /dev/vg_system/root" ; figlet "fail" ) ;; - debian-edu_*_combi-server) sudo guestmount -a $NAME.raw -m /dev/vg_system/root --ro $SYSTEM_MNT || ( echo "Warning: cannot mount /dev/vg_system/root" ; figlet "fail" ) + debian-edu_*-server) sudo guestmount -a $NAME.raw -m /dev/vg_system/root --ro $SYSTEM_MNT || ( echo "Warning: cannot mount /dev/vg_system/root" ; figlet "fail" ) sudo guestmount -a $NAME.raw -m /dev/vg_system/var -o nonempty --ro $SYSTEM_MNT/var || ( echo "Warning: cannot mount /dev/vg_system/var" ; figlet "fail" ) sudo guestmount -a $NAME.raw -m /dev/vg_system/usr -o nonempty --ro $SYSTEM_MNT/usr || ( echo "Warning: cannot mount /dev/vg_system/usr" ; figlet "fail" ) ;; @@ -677,7 +677,7 @@ save_logs() { sync case $NAME in debian-edu_*_workstation) ;; - debian-edu_*_combi-server) sudo umount -l $SYSTEM_MNT/var || ( echo "Warning: cannot un-mount $SYSTEM_MNT/var" ; figlet "fail" ) + debian-edu_*-server) sudo umount -l $SYSTEM_MNT/var || ( echo "Warning: cannot un-mount $SYSTEM_MNT/var" ; figlet "fail" ) sudo umount -l $SYSTEM_MNT/usr || ( echo "Warning: cannot un-mount $SYSTEM_MNT/usr" ; figlet "fail" ) ;; debian-edu_*) sudo umount -l $SYSTEM_MNT/var || ( echo "Warning: cannot un-mount $SYSTEM_MNT/var" ; figlet "fail" ) |