Use multiboot for booting MirOS BSD when using grub2

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index 3bf80e8..453a2b8 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -283,9 +283,9 @@ menuentry "FreeDOS" {
     initrd  /boot/addons/balder10.imz
 }
 
-menuentry "MirBSD" {
+menuentry "MirOS BSD" {
     set root=(hd0,%(install_partition)s)
-    linux   /boot/addons/bsd4grml/ldbsd.com
+    multiboot   /boot/addons/bsd4grml/ldbsd.com
 }
 
 menuentry "Boot OS of first partition on first disk" {
@@ -453,7 +453,7 @@ title FreeDOS
 kernel (hd0,%(install_partition)s)/boot/addons/memdisk
 initrd (hd0,%(install_partition)s)/boot/addons/balder10.imz
 
-title MirBSD
+title MirOS BSD
 kernel (hd0,%(install_partition)s)/boot/addons/bsd4grml/ldbsd.com
 
 """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp,
@@ -869,7 +869,7 @@ def unmount(target, unmount_options):
     # make sure we unmount only already mounted targets
     target_unmount = False
     mounts = open('/proc/mounts').readlines()
-    mountstring = re.compile(".*%s.*" % re.escape(target))
+    mountstring = re.compile(".*%s.*" % re.escape(os.path.realpath(target)))
     for line in mounts:
         if re.match(mountstring, line):
             target_unmount = True