projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
a09b97f
..
05d3b38
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-1220,6
+1220,8
@@
def install_iso_files(grml_flavour, iso_mount, device, target):
# * catch "install: .. No space left on device" & CO
if options.dryrun:
# * catch "install: .. No space left on device" & CO
if options.dryrun:
+ global GRML_DEFAULT
+ GRML_DEFAULT = grml_flavour
return 0
elif not options.bootloaderonly:
logging.info("Copying files. This might take a while....")
return 0
elif not options.bootloaderonly:
logging.info("Copying files. This might take a while....")
@@
-1892,6
+1894,10
@@
def main():
if options.dryrun:
logging.info("Running in simulation mode as requested via option dry-run.")
if options.dryrun:
logging.info("Running in simulation mode as requested via option dry-run.")
+ if options.grubmbr and not options.grub:
+ logging.critical("Error: --grub-mbr requires --grub option.")
+ sys.exit(1)
+
# specified arguments
device = args[len(args) - 1]
isos = args[0:len(args) - 1]
# specified arguments
device = args[len(args) - 1]
isos = args[0:len(args) - 1]