summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-23 22:06:54 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-24 10:10:33 +0200
commita911c88594ed54bc616f61bbfa6975c0165cd0ca (patch)
tree366bb5c38c5c4a639f4f9f935eb2ec1f28b1370c /bin
parent1cfc67c8d70f0915fbd72175de8eb084187456f3 (diff)
downloadjenkins.debian.net-a911c88594ed54bc616f61bbfa6975c0165cd0ca.tar.xz
g-i-installation: first save logs, then remove lvm
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh27
1 files changed, 15 insertions, 12 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index c175a6ff..ffd360cb 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -92,6 +92,21 @@ cleanup_all() {
#
sudo kill -9 $(ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " 2>/dev/null | awk '{print $1}') || true
sleep 0.3s
+ #
+ # save logs if there are any
+ #
+ case $NAME in
+ *_rescue*) ;;
+ *) if [ $NR -gt 200 ] ; then
+ save_logs
+ else
+ echo "Not trying to get logs."
+ fi
+ ;;
+ esac
+ #
+ # remove lvm volume
+ #
sudo lvremove -f $LV
rm -f $QEMU_LAUNCHER
#
@@ -119,18 +134,6 @@ cleanup_all() {
rm $i
done
fi
- #
- # save logs if there are any
- #
- case $NAME in
- *_rescue*) ;;
- *) if [ $NR -gt 200 ] ; then
- save_logs
- else
- echo "Not trying to get logs."
- fi
- ;;
- esac
}
show_preseed() {