Adjust trap handling to get clean exit.

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 0183b6f..85b001c 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -154,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 {{{
@@ -558,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