projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for boot flag before possibly creating FAT16 on the partition
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
846c799
..
70d5142
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-518,7
+518,7
@@
def check_boot_flag(device):
else:
logging.debug("boot flag is NOT enabled on %s" % device)
raise VerifyException(
else:
logging.debug("boot flag is NOT enabled on %s" % device)
raise VerifyException(
- "Device %s does not have the bootflag set. "
+ "Device %s does not have the boot
flag set. "
"Please enable it to be able to boot." % device
)
except ImportError:
"Please enable it to be able to boot." % device
)
except ImportError:
@@
-1875,10
+1875,6
@@
def install_grml(mountpoint, device):
register_tmpfile(device_mountpoint)
remove_device_mountpoint = True
try:
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:
set_rw(device)
mount(device, device_mountpoint, ["-o", "utf8,iocharset=iso8859-1"])
except CriticalException:
@@
-2163,6
+2159,9
@@
def main():
# provide upgrade path
handle_compat_warning(device)
# provide upgrade path
handle_compat_warning(device)
+ if not options.skipbootflag:
+ check_boot_flag(device)
+
# check for vfat partition
handle_vfat(device)
# check for vfat partition
handle_vfat(device)