projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ba9f5e
)
check_for_fat always check for fat device.
author
Ulrich Dangel
<uli@spamt.net>
Tue, 10 Nov 2009 09:37:02 +0000
(10:37 +0100)
committer
Ulrich Dangel
<uli@spamt.net>
Tue, 10 Nov 2009 09:37:02 +0000
(10:37 +0100)
grml2usb
patch
|
blob
|
history
diff --git
a/grml2usb
b/grml2usb
index
6f9eec9
..
462baf4
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-945,7
+945,7
@@
def check_for_fat(partition):
raise CriticalException("Failed to read device %s"
" (wrong UID/permissions or device/directory not present?)" % partition)
raise CriticalException("Failed to read device %s"
" (wrong UID/permissions or device/directory not present?)" % partition)
- if
options.syslinux and
filesystem != "vfat":
+ if filesystem != "vfat":
raise CriticalException("Partition %s does not contain a FAT16 filesystem. (Use --fat16 or run mkfs.vfat %s)" % (partition, partition))
except OSError:
raise CriticalException("Partition %s does not contain a FAT16 filesystem. (Use --fat16 or run mkfs.vfat %s)" % (partition, partition))
except OSError:
@@
-1810,7
+1810,7
@@
def handle_vfat(device):
# check for vfat filesystem
if device is not None and not os.path.isdir(device):
try:
# check for vfat filesystem
if device is not None and not os.path.isdir(device):
try:
- check_for_fat(device)
+
if options.syslinux:
check_for_fat(device)
except CriticalException, error:
logging.critical("Execution failed: %s", error)
sys.exit(1)
except CriticalException, error:
logging.critical("Execution failed: %s", error)
sys.exit(1)