diff options
| author | Holger Levsen <holger@layer-acht.org> | 2012-12-22 22:29:34 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2012-12-22 22:29:34 +0100 |
| commit | de77050228aef5f056b90ac0ac9538d9f8fa445c (patch) | |
| tree | a68ee91e6664eefbe23e9ea791b09e378b5b341f | |
| parent | a9d78b296c5a5c293a52707106b78ffc0e79ad96 (diff) | |
| download | jenkins.debian.net-de77050228aef5f056b90ac0ac9538d9f8fa445c.tar.xz | |
fix image mounting for debian-edu and use NAME always
| -rwxr-xr-x | bin/g-i-installation.sh | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 5fe29da0..fdad5ec6 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -126,8 +126,8 @@ bootstrap_system() { INST_KEYMAP="keymap=us" INST_VIDEO="video=vesa:ywrap,mtrr vga=788" EXTRA_APPEND="" - case $JOB_NAME in - *debian-edu_squeeze-test*) + case $NAME in + debian-edu_squeeze-test*) INST_KEYMAP="console-keymaps-at/$INST_KEYMAP" ;; *_sid_daily*) @@ -135,17 +135,17 @@ bootstrap_system() { ;; *) ;; esac - case $JOB_NAME in - *debian_*xfce) + case $NAME in + debian_*xfce) EXTRA_APPEND="$EXTRA_APPEND desktop=xfce" ;; - *debian_*lxde) + debian_*lxde) EXTRA_APPEND="$EXTRA_APPEND desktop=lxde" ;; - *debian_*kde) + debian_*kde) EXTRA_APPEND="$EXTRA_APPEND desktop=kde" ;; - *debian_*rescue) + debian_*rescue) EXTRA_APPEND="$EXTRA_APPEND rescue/enable=true" ;; *) ;; @@ -422,7 +422,13 @@ save_logs() { cd $WORKSPACE SYSTEM_MNT=/media/$NAME sudo mkdir -p $SYSTEM_MNT - sudo guestmount -o uid=$(id -u) -o gid=$(id -g) -a $NAME.raw -m /dev/debian/root --ro $SYSTEM_MNT || true + case $NAME in + debian-edu_*) sudo guestmount -o uid=$(id -u) -o gid=$(id -g) -a $NAME.raw -m /dev/vg_system/root --ro $SYSTEM_MNT || true + sudo guestmount -o uid=$(id -u) -o gid=$(id -g) -a $NAME.raw -m /dev/vg_system/var -o nonempty --ro $SYSTEM_MNT/var || true + ;; + *) sudo guestmount -o uid=$(id -u) -o gid=$(id -g) -a $NAME.raw -m /dev/debian/root --ro $SYSTEM_MNT || true + ;; + esac ls ls $NAME.raw -la ls $SYSTEM_MNT @@ -440,6 +446,11 @@ save_logs() { echo "Warning: cannot mount installed system to copy the logs..." cp $NAME.raw $NAME.raw.bak fi + case $NAME in + debian-edu_*) sudo umount -l $SYSTEM_MNT/var || true + ;; + *) ;; + esac sudo umount -l $SYSTEM_MNT || true } @@ -468,7 +479,7 @@ fi # NR=0 bootstrap_system -case $JOB_NAME in +case $NAME in *rescue) monitor_system rescue ;; *) monitor_system install true @@ -477,7 +488,7 @@ esac # # boot up installed system # -case $JOB_NAME in +case $NAME in *rescue) ;; *) # # kill qemu and image |