projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/pr/35'
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
867bea0
..
6a8ada2
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-1881,10
+1881,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:
@@
-2169,6
+2165,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)