Check for FAT16 only when using --syslinux

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index 2f9fb87..cdeaa03 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -881,7 +881,7 @@ def check_for_fat(partition):
             raise CriticalException("Failed to read device %s"
                                     " (wrong UID/permissions or device not present?)" % partition)
 
-        if filesystem != "vfat":
+        if options.syslinux and filesystem != "vfat":
             raise CriticalException("Partition %s does not contain a FAT16 filesystem. (Use --fat16 or run mkfs.vfat %s)" % (partition, partition))
 
     except OSError:
@@ -1077,15 +1077,6 @@ def copy_bootloader_files(iso_mount, target):
                                 grub_target + 'ascii.pff'])
         proc.wait()
 
-    if not os.path.isfile("/usr/share/grml2usb/grub/stage2_eltorito"):
-        logging.critical("Error: /usr/share/grml2usb/grub/stage2_eltorito can not be read.")
-        raise
-    else:
-        logging.debug("cp /usr/share/grml2usb/grub/stage2_eltorito to %s" % grub_target + 'stage2_eltorito')
-        proc = subprocess.Popen(["install", "--mode=664", '/usr/share/grml2usb/grub/stage2_eltorito',
-                                grub_target + 'stage2_eltorito'])
-        proc.wait()
-
 
 def install_iso_files(grml_flavour, iso_mount, device, target):
     """Copy files from ISO on given target"""