X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=7e91839022568bc6d1c405f6be1a7fdc212352a0;hp=cb4d62132753a74e94438f7672eb36c0f43673dd;hb=7f9c07b41d2af167b77e013584e6cc64c90dd98f;hpb=cba6faf582b742821466653e4cec91735144e753 diff --git a/grml2usb b/grml2usb index cb4d621..7e91839 100755 --- a/grml2usb +++ b/grml2usb @@ -21,7 +21,7 @@ import glob import uuid # global variables -PROG_VERSION = "0.9.20" +PROG_VERSION = "0.9.22" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg @@ -1252,9 +1252,9 @@ def install_iso_files(grml_flavour, iso_mount, device, target): # * provide alternative search_file() if file information is stored in a config.ini file? # * catch "install: .. No space left on device" & CO + global GRML_DEFAULT + GRML_DEFAULT = grml_flavour 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....") @@ -1858,7 +1858,7 @@ def handle_vfat(device): logging.critical("Execution failed: %s", error) sys.exit(1) - if not os.path.isdir(device) and not check_for_usbdevice(device): + if not os.path.isdir(device) and not check_for_usbdevice(device) and not option.force: print "Warning: the specified device %s does not look like a removable usb device." % device f = raw_input("Do you really want to continue? y/N ") if f == "y" or f == "Y":