projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable usage of --copy-only and --grub at the same time
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
9d5c2ef
..
e608ac1
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-645,6
+645,10
@@
def install_mbr(mbrtemplate, device, partition, ismirbsdmbr=True):
raise Exception("error executing dd (third run)")
del tmpf
raise Exception("error executing dd (third run)")
del tmpf
+ # make sure we sync filesystems before returning
+ proc = subprocess.Popen(["sync"])
+ proc.wait()
+
def is_writeable(device):
"""Check if the device is writeable for the current user
def is_writeable(device):
"""Check if the device is writeable for the current user
@@
-1732,6
+1736,9
@@
def check_options(opts):
if opts.grubmbr and not opts.grub:
raise CriticalException("--grub-mbr requires --grub option.")
if opts.grubmbr and not opts.grub:
raise CriticalException("--grub-mbr requires --grub option.")
+ if opts.copyonly and opts.grub:
+ raise CriticalException("Cannot use --copy-only and --grub at the same time.")
+
def check_programs():
"""check if all needed programs are installed"""
def check_programs():
"""check if all needed programs are installed"""