diff options
| -rwxr-xr-x | bin/g-i-installation.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 8b14a872..30671635 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -570,11 +570,12 @@ save_logs() { # FIXME: bugreport guestmount: -o uid doesnt work: # "sudo guestmount -o uid=$(id -u) -o gid=$(id -g)" would be nicer, bt it doesnt work: as root, the files seem to belong to jenkins, but as jenkins they cannot be accessed case $NAME in - debian-edu_*) sudo guestmount -a $NAME.raw -m /dev/vg_system/root --ro $SYSTEM_MNT || true - sudo guestmount -a $NAME.raw -m /dev/vg_system/var -o nonempty --ro $SYSTEM_MNT/var || true - ;; - *) sudo guestmount -a $NAME.raw -m /dev/debian/root --ro $SYSTEM_MNT || true - ;; + 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_*) 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/debian/root --ro $SYSTEM_MNT || echo "Warning: cannot mount /dev/debian/root" ; figlet "fail" + ;; esac # # copy logs (and continue if some logs cannot be copied) @@ -592,11 +593,12 @@ save_logs() { # sync case $NAME in - debian-edu_*) sudo umount -l $SYSTEM_MNT/var || true - ;; - *) ;; + debian-edu_*_workstation) ;; + debian-edu_*) sudo umount -l $SYSTEM_MNT/var || echo "Warning: cannot un-mount $SYSTEM_MNT/var" ; figlet "fail" + ;; + *) ;; esac - sudo umount -l $SYSTEM_MNT || true + sudo umount -l $SYSTEM_MNT || echo "Warning: cannot un-mount $SYSTEM_MNT" ; figlet "fail" } trap cleanup_all INT TERM EXIT |