X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=759197082d1bfe39873071e3d7e03a42fc639239;hp=ce2288207c85f7128f522425aaa7ff37adaf12cd;hb=1a0fe351ba761baae3a30076ba37ffe6050f5d63;hpb=53db55285b887a61a8eec04b19c569a0836c2274 diff --git a/grml2usb b/grml2usb index ce22882..7591970 100755 --- a/grml2usb +++ b/grml2usb @@ -20,7 +20,7 @@ import fileinput import glob # global variables -PROG_VERSION = "0.9.18" +PROG_VERSION = "0.9.19-pre1" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg @@ -1714,11 +1714,15 @@ def handle_iso(iso, device): register_tmpfile(device_mountpoint) remove_device_mountpoint = True try: - mount(device, device_mountpoint, "") + check_for_fat(device) + mount(device, device_mountpoint, ['-o', 'utf8,iocharset=iso8859-1']) except CriticalException, error: - logging.critical("Fatal: %s", error) - cleanup() - sys.exit(1) + try: + mount(device, device_mountpoint, "") + except CriticalException, error: + logging.critical("Fatal: %s", error) + cleanup() + sys.exit(1) try: try: