summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-01-02 15:08:23 +0100
committerHolger Levsen <holger@layer-acht.org>2013-01-02 15:08:23 +0100
commit34c6a70212f50419871603000db84f551cf54118 (patch)
treeda6cdf03005f3128f2ff0376a34ca66d3f6c03e6 /bin
parentd50bec7be48da1d3788b806d763bef2c5467434c (diff)
downloadjenkins.debian.net-34c6a70212f50419871603000db84f551cf54118.tar.xz
g-i-installation: dont always output fail
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 0e969dfc..f7615dbc 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -570,12 +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_*_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_*_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"
+ 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"
+ *) sudo guestmount -a $NAME.raw -m /dev/debian/root --ro $SYSTEM_MNT || ( echo "Warning: cannot mount /dev/debian/root" ; figlet "fail" )
;;
esac
#
@@ -595,11 +595,11 @@ save_logs() {
sync
case $NAME in
debian-edu_*_workstation) ;;
- debian-edu_*) sudo umount -l $SYSTEM_MNT/var || echo "Warning: cannot un-mount $SYSTEM_MNT/var" ; figlet "fail"
+ debian-edu_*) sudo umount -l $SYSTEM_MNT/var || ( echo "Warning: cannot un-mount $SYSTEM_MNT/var" ; figlet "fail" )
;;
*) ;;
esac
- sudo umount -l $SYSTEM_MNT || echo "Warning: cannot un-mount $SYSTEM_MNT" ; figlet "fail"
+ sudo umount -l $SYSTEM_MNT || ( echo "Warning: cannot un-mount $SYSTEM_MNT" ; figlet "fail" )
}
trap cleanup_all INT TERM EXIT