diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-29 14:58:23 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-11-29 15:06:05 +0100 |
| commit | 85fb5760aa022255fa9f227c5f02ee1d54401a47 (patch) | |
| tree | 941128437a4724037d15703b23d9b00530ffc4e0 | |
| parent | 0685974b1433a18a5a6ad4d20ec74336a92af6aa (diff) | |
| download | jenkins.debian.net-85fb5760aa022255fa9f227c5f02ee1d54401a47.tar.xz | |
g-i: Fix setting FAILURE in the main shell script variables, not subshells
| -rw-r--r-- | bin/g-i-installation.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 74a974a8..a5e8af70 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -1203,15 +1203,15 @@ save_logs() { FAILURE=false # FIXME: bugreport guestmount: -o uid doesnt work: # "sudo guestmount -o uid=$(id -u) -o gid=$(id -g)" would be nicer, but it doesnt work: as root, the files seem to belong to jenkins, but as jenkins they cannot be accessed - sudo guestmount -a $LV -i --ro $SYSTEM_MNT || ( echo "Warning: cannot mount filesystems from $LV" ; export FAILURE=true ) + sudo guestmount -a $LV -i --ro $SYSTEM_MNT || { echo "Warning: cannot mount filesystems from $LV" ; export FAILURE=true ; } # # copy logs (and continue if some logs cannot be copied) # - sudo cp -rv $SYSTEM_MNT/var/log $SYSTEM_MNT/etc/fstab $RESULTS/ || ( echo "Warning: cannot get logs from installed system." ; echo "Did the installation finish correctly?" ; export FAILURE=true ) + sudo cp -rv $SYSTEM_MNT/var/log $SYSTEM_MNT/etc/fstab $RESULTS/ || { echo "Warning: cannot get logs from installed system." ; echo "Did the installation finish correctly?" ; export FAILURE=true ; } # # get list of installed packages # - sudo chroot $SYSTEM_MNT dpkg -l > $RESULTS/dpkg-l || ( echo "Warning: cannot run dpkg inside the installed system, did the installation finish correctly?" ; export FAILURE=true ) + sudo chroot $SYSTEM_MNT dpkg -l > $RESULTS/dpkg-l || { echo "Warning: cannot run dpkg inside the installed system, did the installation finish correctly?" ; export FAILURE=true ; } # # check for must installed packages # @@ -1242,7 +1242,7 @@ save_logs() { fi if [ ! -z "$LTSPARCH" ] ; then sudo cp -rv $SYSTEM_MNT/opt/ltsp/$LTSPARCH/var/log $RESULTS/log/opt/ - sudo chroot $SYSTEM_MNT/opt/ltsp/$LTSPARCH dpkg -l > $RESULTS/log/opt/dpkg-l || ( echo "Warning: cannot run dpkg inside the ltsp chroot." ; sudo ls -la $SYSTEM_MNT/opt/ltsp/$LTSPARCH ; export FAILURE=true ) + sudo chroot $SYSTEM_MNT/opt/ltsp/$LTSPARCH dpkg -l > $RESULTS/log/opt/dpkg-l || { echo "Warning: cannot run dpkg inside the ltsp chroot." ; sudo ls -la $SYSTEM_MNT/opt/ltsp/$LTSPARCH ; export FAILURE=true ; } fi ;; *) ;; @@ -1253,7 +1253,7 @@ save_logs() { #for MP in var/log var/ usr/ boot/ opt/ home/ debianedufreespace/ skole/tjener/home0 var/opt/ltsp/swapfiles skole/backup/ var/spool/squid3/ ; do # sudo umount -l $SYSTEM_MNT/$MP 2>/dev/null || true #done - sudo umount -l $SYSTEM_MNT || ( echo "Warning: cannot un-mount $SYSTEM_MNT" ; export FAILURE=true ) + sudo umount -l $SYSTEM_MNT || { echo "Warning: cannot un-mount $SYSTEM_MNT" ; export FAILURE=true ; } # # make sure we can read everything after installation # |