From: Ulrich Dangel <uli@spamt.net>
Date: Tue, 10 Nov 2009 09:57:12 +0000 (+0100)
Subject: Mount vfat devices with explicit iocharset option. [Closes: issue735]
X-Git-Tag: v0.9.19~3
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=d865dac780a810685df28850f7da8416be364d88

Mount vfat devices with explicit iocharset option. [Closes: issue735]
---

diff --git a/grml2usb b/grml2usb
index ce22882..487f315 100755
--- a/grml2usb
+++ b/grml2usb
@@ -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: