Move syslinux check to install_syslinux_mbr()

diff --git a/debian/changelog b/debian/changelog
index 01289da..e32a847 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,15 @@ grml2usb (0.9.8) UNRELEASED; urgency=low
     - thanks once more to Thorsten Glaser for helping and patches
     - thanks to Ernesto Domato for reporting the issue regarding
       i386<->amd64 with grub-mkimage
-
- -- Michael Prokop <mika@grml.org>  Tue, 09 Jun 2009 00:20:38 +0200
+  * Move syslinux check to install_syslinux_mbr()
+  * Drop the reference to --grub option (thanks for the bugreport
+    to Peter Palfrader)
+  * Update documentation:
+    - mention the dd approach
+    - mention grml2iso
+    - improve section link names for the online version
+
+ -- Michael Prokop <mika@grml.org>  Tue, 16 Jun 2009 00:27:30 +0200
 
 grml2usb (0.9.7) unstable; urgency=low
 

diff --git a/grml2usb b/grml2usb
index 7cc07c3..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")
@@ -1564,12 +1568,6 @@ 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