X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=85b001c84e61aaf856912c273a355c8e44c08e41;hb=8d897e713d3564c8b10b0202bb928719024e956b;hp=2a05d0570f9911ecd68f94bf8edd829682e0e0c3;hpb=e91516d1163b3ec84a6d66ef7053d8bac46e218e;p=grml-live.git

diff --git a/grml-live b/grml-live
index 2a05d05..85b001c 100755
--- a/grml-live
+++ b/grml-live
@@ -20,7 +20,8 @@ else
 fi
 
 # exit on any error:
-set -e
+# disable for now since it seems to cause some problems
+# set -e
 
 # global variables
 GRML_LIVE_VERSION='0.14.1'
@@ -153,7 +154,8 @@ bailout() {
   log "------------------------------------------------------------------------------"
   exit "$EXIT"
 }
-trap bailout 1 2 3 3 6 9 14 15 EXIT
+trap bailout 1 2 3 3 6 9 14 15
+trap umount_all EXIT
 # }}}
 
 # log file stuff {{{
@@ -557,6 +559,7 @@ else
       # Remove all FAI logs from chroot if class RELEASE is used:
       if [ -f "$CHROOT_OUTPUT"/etc/grml_fai_release ] ; then
          rm -rf "$CHROOT_OUTPUT"/var/log/fai/*
+         rm -f "$CHROOT_OUTPUT"/var/log/install_packages.list
       fi
 
       umount_all