X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=5aea516f9ccc968c62c12f0a1291ebe50e124cc4;hp=c2ea5e0cc041c9c1c26a4aa9c30ddadad6d13f16;hb=9e7ee70e9e76ab01f9b5ff2ae490236bc0e3c6d2;hpb=3f1c77704719f89e768d5137257a29d194cd8a59

diff --git a/grml2usb b/grml2usb
index c2ea5e0..5aea516 100755
--- a/grml2usb
+++ b/grml2usb
@@ -20,7 +20,7 @@ import glob
 import uuid
 
 # global variables
-PROG_VERSION = "0.9.23"
+PROG_VERSION = "0.9.25"
 MOUNTED = set()  # register mountpoints
 TMPFILES = set() # register tmpfiles
 DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
@@ -625,7 +625,6 @@ def install_grub(device):
                 mount(device, device_mountpoint, "")
 
                 # If using --grub-mbr then make sure we install grub in MBR instead of PBR
-                # Thanks to grub2. NOT.
                 if options.grubmbr:
                     logging.debug("Using option --grub-mbr ...")
                     if device[-1:].isdigit():
@@ -638,13 +637,13 @@ def install_grub(device):
                 logging.info("Installing grub as bootloader")
                 logging.debug("grub-install --recheck --no-floppy --root-directory=%s %s",
                               device_mountpoint, grub_device)
-                proc = subprocess.Popen(["grub-install", "--recheck", "--no-floppy",
+                proc = subprocess.Popen(["grub-install", "--recheck", "--force", "--no-floppy",
                                          "--root-directory=%s" % device_mountpoint, grub_device], stdout=file(os.devnull, "r+"))
                 proc.wait()
                 if proc.returncode != 0:
                     # raise Exception("error executing grub-install")
                     logging.critical("Fatal: error executing grub-install (please check the grml2usb FAQ or drop the --grub option)")
-                    logging.critical("Note:  if using grub2 consider using the --grub-mbr option because grub2's PBR feature is broken.")
+                    logging.critical("Note:  if using grub2 consider using the --grub-mbr option as grub considers PBR problematic.")
                     cleanup()
                     sys.exit(1)
             except CriticalException, error:
@@ -1942,7 +1941,7 @@ def handle_vfat(device):
             logging.critical("Execution failed: %s", error)
             sys.exit(1)
 
-    if not os.path.isdir(device) and not check_for_usbdevice(device) and not option.force:
+    if not os.path.isdir(device) and not check_for_usbdevice(device) and not options.force:
         print "Warning: the specified device %s does not look like a removable usb device." % device
         f = raw_input("Do you really want to continue? y/N ")
         if f == "y" or f == "Y":