import uuid
# global variables
-PROG_VERSION = "0.9.24"
+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
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():
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:
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":