Support arbitrary grml2usb options in grml2iso

diff --git a/grml2iso b/grml2iso
index 8a07f1a..5992992 100755 (executable)
--- 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.
 ################################################################################
 # 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
 
 # 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:
     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
   }
 "
     [ -n "$1" ] && exit $1 || exit 1
   }


@@ -58,14 +58,15 @@ Options:
   DIR=''
   ADD_OPTS=''
   FORCE=''
   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";;
     case $name in
       o)   ISOFILE="$OPTARG";;

-      b)   ADD_OPTS="--bootoption="$OPTARG"";;
+      b)   GRML2USB_OPTS+=(--bootoptions="$OPTARG");;

       c)   DIR="$OPTARG";;
       f)   FORCE='true';;
       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
       ?)   usage 2;;
     esac
   done


@@ -125,7 +126,7 @@ Options:
   # remove all parameters
   shift $(($OPTIND - 1))
 
   # remove all parameters
   shift $(($OPTIND - 1))
 

-  $GRML2USB "${REMOVE_OPTS[@]}" ${ADD_OPTS:+"$ADD_OPTS"} "$@" "$WRKDIR/cddir"
+  $GRML2USB "${GRML2USB_OPTS[@]}" "$@" "$WRKDIR/cddir"

 # }}}
 
 
 # }}}
 
 

diff --git a/grml2iso.8.txt b/grml2iso.8.txt
index 24fbc2d..8ed8eaa 100644 (file)
--- a/grml2iso.8.txt
+++ b/grml2iso.8.txt
@@ -53,6 +53,9 @@ Force the program to run and overwrite an existing iso image.
 
 Remove specified boot parameter from existing command line. Could be specified multiple times.
 
 
 Remove specified boot parameter from existing command line. Could be specified multiple times.
 

+  *\-p <grml2usb param>*::
+
+Execute grml2usb with the specified parameters. For a list of valid parameters have a look at the link:http://grml.org/grml2usb/[grml2usb webpage] or the grml2usb manpage

 
 
 
 
 
 


@@ -81,6 +84,11 @@ grml64-medium_2009.05.iso using /srv/git/grml2usb as grml2usb script.
 Use /mnt/test/grml-tmp as working directory for creating the multiboot ISO
 /mnt/test/grml.iso with grml_2009.05.iso and grml64_2009.05.iso.
 
 Use /mnt/test/grml-tmp as working directory for creating the multiboot ISO
 /mnt/test/grml.iso with grml_2009.05.iso and grml64_2009.05.iso.
 

+  # grml2iso -p --skip-addons -o /srv/grml.iso /srv/grml-small_2009.10.iso /srv/grml64-small_2009.10.iso
+
+Don't copy the addons from the specified iso images
+
+

 Online Ressources
 -----------------
 
 Online Ressources
 -----------------