def check_boot_flag(device):
+ if os.path.isdir(device):
+ logging.debug(
+ "Device %s is a directory, skipping check for boot flag." % device
+ )
+ return
+
boot_dev, x = get_device_from_partition(device)
logging.info("Checking for boot flag")
"mbrtemplate" file, set the "partition" (0..3) active, and install the
result back to "device".
- @mbrtemplate: default MBR file
+ @mbrtemplate: default MBR file (must be a valid MBR file of at least 440
+ (or 439 if ismirbsdmbr) bytes)
@device: name of a file assumed to be a hard disc (or USB stick) image, or
something like "/dev/sdb"
@partition: must be a number between 0 and 3, inclusive
- @mbrtemplate: must be a valid MBR file of at least 440 (or 439 if
- ismirbsdmbr) bytes.
-
@ismirbsdmbr: if true then ignore the active flag, set the mirbsdmbr
specific flag to 0/1/2/3 and set the MBR's default value accordingly. If
false then leave the mirbsdmbr specific flag set to FFh, set all
proc = subprocess.Popen(["sync"])
proc.wait()
+ logging.debug("Probing device via 'blockdev --rereadpt %s'", device)
+ proc = subprocess.Popen(["blockdev", "--rereadpt", device])
+ proc.wait()
+ if proc.returncode != 0:
+ raise Exception(
+ "Couldn't execute blockdev on '%s' (install util-linux?)", device
+ )
+
set_rw(device)
if x.startswith(source):
raise CriticalException(
(
- "Error executing mount: %s already mounted - "
+ "Error executing mount: {0} already mounted - "
"please unmount before invoking grml2usb"
).format(source)
)
register_tmpfile(device_mountpoint)
remove_device_mountpoint = True
try:
- check_for_fat(device)
- if not options.skipbootflag:
- check_boot_flag(device)
-
set_rw(device)
mount(device, device_mountpoint, ["-o", "utf8,iocharset=iso8859-1"])
except CriticalException:
break
if not mbrcode:
- str_locations = " or ".join(['"%s"' % l for l in mbr_locations])
+ str_locations = " or ".join(['"%s"' % x for x in mbr_locations])
logging.error("Cannot find syslinux MBR, install it at %s)", str_locations)
raise CriticalException(
"syslinux MBR can not be found at %s." % str_locations
# provide upgrade path
handle_compat_warning(device)
+ if not options.skipbootflag:
+ check_boot_flag(device)
+
# check for vfat partition
handle_vfat(device)