Add grml2iso manpage to Debian package

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index a479a3c..312f6eb 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -705,6 +705,10 @@ def install_syslinux_mbr(device):
 
     @device: device where MBR of syslinux should be installed to"""
 
+    # make sure we have syslinux available
+    if not which("syslinux") and not options.copyonly:
+        raise Exception("syslinux not available (either install it or consider dropping the --syslinux option)")
+
     # lilo's mbr is broken, use the one from syslinux instead:
     if not os.path.isfile("/usr/lib/syslinux/mbr.bin"):
         raise Exception("/usr/lib/syslinux/mbr.bin can not be read")
@@ -867,7 +871,7 @@ def mount(source, target, mount_options):
             raise CriticalException("Error executing mount: %s already mounted - please unmount before invoking grml2usb" % source)
 
     if os.path.isdir(source):
-        logging.debug("Source %s is not a device, not mounting therefor." % source)
+        logging.debug("Source %s is not a device, therefore not mounting." % source)
         return 0
 
     logging.debug("mount %s %s %s" % (mount_options, source, target))
@@ -1195,7 +1199,7 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
 
     if not options.skipaddons:
         if grml_flavour.endswith('-small'):
-            logging.info("Note: grml-small doesn't provide any addons, not installing them therefor.")
+            logging.info("Note: grml-small doesn't provide any addons, not installing them therefore.")
         else:
             copy_addons(iso_mount, target)
 
@@ -1460,7 +1464,7 @@ def handle_dir(live_image, device):
     logging.info("Using %s as install base" % live_image)
 
     if os.path.isdir(device):
-        logging.info("Specified target is a directory, not mounting therefor.")
+        logging.info("Specified target is a directory, therefore not mounting.")
         device_mountpoint = device
         remove_device_mountpoint = False
     else:
@@ -1517,7 +1521,7 @@ def handle_iso(iso, device):
         sys.exit(1)
 
     if os.path.isdir(device):
-        logging.info("Specified target is a directory, not mounting therefor.")
+        logging.info("Specified target is a directory, therefore not mounting.")
         device_mountpoint = device
         remove_device_mountpoint = False
         # skip_mbr = True
@@ -1564,19 +1568,13 @@ def handle_mbr(device):
         logging.info("Would install MBR")
         return 0
 
-    # make sure we have syslinux available
-    if not which("syslinux") and not options.copyonly:
-        logging.critical('Sorry, syslinux not available. Exiting.')
-        logging.critical('Please install syslinux or consider using the --grub option.')
-        sys.exit(1)
-
     if device[-1:].isdigit():
         mbr_device = re.match(r'(.*?)\d*$', device).group(1)
         partition_number = int(device[-1:]) - 1
         skip_install_mir_mbr = False
 
     # if we get e.g. /dev/loop1 as device we don't want to put the MBR
-    # into /dev/loop of course, therefor use /dev/loop1 as mbr_device
+    # into /dev/loop of course, therefore use /dev/loop1 as mbr_device
     if mbr_device == "/dev/loop":
         mbr_device = device
         logging.info("Detected loop device - using %s as MBR device therefore" % mbr_device)
@@ -1630,7 +1628,7 @@ def handle_vfat(device):
             logging.critical("Execution failed: %s", error)
             sys.exit(1)
 
-    if not check_for_usbdevice(device) and not os.path.isdir(device):
+    if not os.path.isdir(device) and not check_for_usbdevice(device):
         print "Warning: the specified device %s does not look like a removable usb device." % device
         f = raw_input("Do you really want to continue? y/N ")
         if f == "y" or f == "Y":