X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml2iso;h=59929925acd82a2c7cf24373fa50595102b8cb5f;hb=d85b3e390008b8659eb9929ec8d28c0ec82e1f89;hp=8e4e06af502220b5eafee04c5b068762867db050;hpb=f5e949b339a40e04094d0e066a06a547afcdf4e9;p=grml2usb.git

diff --git a/grml2iso b/grml2iso
index 8e4e06a..5992992 100755
--- a/grml2iso
+++ b/grml2iso
@@ -6,9 +6,6 @@
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
-# TODO:
-# * support setting grml2usb options
-################################################################################
 
 # define function getfilesize before "set -e" {{{
   if stat --help >/dev/null 2>&1; then
@@ -41,11 +38,14 @@ fi
     echo >&2 "Usage: $0 [OPTIONS] -o target.iso source1.iso [source2.iso ...]"
     echo >&2 "
 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.
+     -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.
+     -p <grml2usb param> Add the specified parameter to the grml2usb
+                         commandline. For a list of valid parameters have
+                         a look at the grml2usb manpage.
 "
     [ -n "$1" ] && exit $1 || exit 1
   }
@@ -58,14 +58,15 @@ Options:
   DIR=''
   ADD_OPTS=''
   FORCE=''
-  typeset -a REMOVE_OPTS
-  while getopts fb:c:o:r: name; do
+  typeset -a GRML2USB_OPTS
+  while getopts fb:c:o:r:p: name; do
     case $name in
       o)   ISOFILE="$OPTARG";;
-      b)   ADD_OPTS="--bootoption="$OPTARG"";;
+      b)   GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
       c)   DIR="$OPTARG";;
       f)   FORCE='true';;
-      r)   REMOVE_OPTS+=(--remove-bootoption="$OPTARG");;
+      r)   GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");;
+      p)   GRML2USB_OPTS+=("$OPTARG");;
       ?)   usage 2;;
     esac
   done
@@ -83,8 +84,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 {{{
@@ -94,6 +93,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
@@ -113,9 +123,13 @@ Options:
 # }}}}
 
 # execute grml2usb with all ISOs you'd like to install {{{
-  $GRML2USB "${REMOVE_OPTS[@]}" ${ADD_OPTS:+"$ADD_OPTS"} "$@" "$WRKDIR/cddir"
+  # remove all parameters
+  shift $(($OPTIND - 1))
+
+  $GRML2USB "${GRML2USB_OPTS[@]}" "$@" "$WRKDIR/cddir"
 # }}}
 
+
 # move syslinux to isolinux {{{
   mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux