projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increrased version number.
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
ce22882
..
7591970
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-20,7
+20,7
@@
import fileinput
import glob
# global variables
import glob
# global variables
-PROG_VERSION = "0.9.1
8
"
+PROG_VERSION = "0.9.1
9-pre1
"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
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:
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:
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:
try:
try: