X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=8a07f1a2514793980360845d73139c414880291e;hp=36f939af2afe4f379534cdf92e2a9d21f2aa1aa4;hb=a9ab0bfbcc7ff337d8439f3420e539d7a9ddeb6b;hpb=73803e492fb5547b10cfdcf02a3d261759deddd3

diff --git a/grml2iso b/grml2iso
index 36f939a..8a07f1a 100755
--- a/grml2iso
+++ b/grml2iso
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Filename:      grml2iso
 # Purpose:       create a multiboot grml ISO using grml2usb
 # Authors:       Michael Prokop <mika@grml.org>,
@@ -23,6 +23,15 @@
   [ -n "$GRML2USB" ] || GRML2USB='grml2usb'
 # work directory for creating the filesystem
   [ -n "$WRKDIR" ]   || WRKDIR='/tmp/grml2iso.tmp'
+# support mkisofs as well as genisoimage
+  if which mkisofs >/dev/null 2>&1; then
+    MKISOFS='mkisofs'
+  elif which genisoimage >/dev/null 2>&1; then
+    MKISOFS='genisoimage'
+  else
+    echo >&2 "Error: neither mkisofs nor genisoimage available - can not create ISO."
+    exit 1
+fi
 # }}}
 
 # helper stuff {{{
@@ -35,6 +44,8 @@ Options:
      -b Boot Params    Additional boot parameters passed to grml2usb
      -c Directory      Copy files from directory to generated iso
      -f                Force overwrite of existing target.iso
+     -r BootParam      Remove specified boot params.
+                       Could be specfied multiple times.
 "
     [ -n "$1" ] && exit $1 || exit 1
   }
@@ -45,14 +56,16 @@ Options:
 
   ISOFILE=''
   DIR=''
-  GRML2USB_PARAMS=''
+  ADD_OPTS=''
   FORCE=''
-  while getopts fb:c:o: name; do
+  typeset -a REMOVE_OPTS
+  while getopts fb:c:o:r: name; do
     case $name in
       o)   ISOFILE="$OPTARG";;
-      b)   GRML2USB_PARAMS='--bootoptions='"${OPTARG}";;
+      b)   ADD_OPTS="--bootoption="$OPTARG"";;
       c)   DIR="$OPTARG";;
       f)   FORCE='true';;
+      r)   REMOVE_OPTS+=(--remove-bootoption="$OPTARG");;
       ?)   usage 2;;
     esac
   done
@@ -70,8 +83,6 @@ Options:
      echo "Error: specified parameter for -c is not a directory" >&2
      exit 1
   fi
-
-  shift $(($OPTIND - 1))
 # }}}
 
 # we need root permissions for executing grml2usb {{{
@@ -81,6 +92,17 @@ Options:
   fi
 # }}}
 
+# check for grml2usb {{{
+  if [ ! -x "$(which $GRML2USB)" ] || [ ! -x "$GRML2USB" ] ; then
+    echo >&2 "Error: Could not find grml2usb"
+    if [ -x "./$GRML2USB" ] ; then
+      echo >&2 "If you executed grml2iso from the grml2usb repository use"
+      echo >&2 "GRML2USB=./grml2usb $0 $*"
+    fi
+    exit 1
+  fi
+# }}}
+
 # variables {{{
   ORIG_DIR="$(pwd)"
   # note: grub-pc_1.96+20090603-1 seems to be b0rken
@@ -100,9 +122,13 @@ Options:
 # }}}}
 
 # execute grml2usb with all ISOs you'd like to install {{{
-  $GRML2USB "${GRML2USB_PARAMS}" "$@" "$WRKDIR/cddir"
+  # remove all parameters
+  shift $(($OPTIND - 1))
+
+  $GRML2USB "${REMOVE_OPTS[@]}" ${ADD_OPTS:+"$ADD_OPTS"} "$@" "$WRKDIR/cddir"
 # }}}
 
+
 # move syslinux to isolinux {{{
   mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux
 
@@ -120,7 +146,7 @@ Options:
 # }}}
 
 # generate the CD/DVD ISO {{{
-  mkisofs -V 'grml-multiboot' -l -r -J -no-pad \
+  $MKISOFS -V 'grml-multiboot' -l -r -J -no-pad \
     -no-emul-boot -boot-load-size 4 -boot-info-table \
     -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
     -o "$ISOFILE" .