X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=aedf4a6d51d7d15f06b0bb58825ee20105350846;hb=63cf502dc876608b392dd45a0f2b3138e5c54ebd;hp=f620b9fc6162467ba12c3be90daa4b2c17e8c615;hpb=8cfed16940d096b619bf35dad42cbf1928d58b8a;p=grml-live.git

diff --git a/grml-live b/grml-live
index f620b9f..aedf4a6 100755
--- a/grml-live
+++ b/grml-live
@@ -157,6 +157,10 @@ umount_all() {
    umount $CHROOT_OUTPUT/dev/pts 2>/dev/null || /bin/true
    umount $CHROOT_OUTPUT/dev 2>/dev/null || /bin/true
 
+   if [ -n "$EXTRACT_ISO_NAME" ] ; then
+     umount "$EXTRACT_ISO_NAME" 2>/dev/null || /bin/true
+   fi
+
    # certain FAI versions sadly leave a ramdisk behind, so better safe than sorry
    if [ -x /usr/lib/fai/mkramdisk ] ; then
      /usr/lib/fai/mkramdisk -u "$(readlink -f ${CHROOT_OUTPUT}/var/lib/dpkg)" >/dev/null 2>&1 || /bin/true
@@ -880,7 +884,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             copy_addon_file ipxe.lkrn /usr/lib/ipxe addons
             copy_addon_file pci.ids /usr/share/misc addons
             copy_addon_file memtest86+.bin /boot addons
-            for file in memdisk chain.c32 hdt.c32 menu.c32; do
+            for file in memdisk chain.c32 hdt.c32 mboot.c32 menu.c32; do
               copy_addon_file "${file}" /usr/lib/syslinux addons
             done