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

diff --git a/grml2iso b/grml2iso
index 36f939a..10f270c 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>,
@@ -35,6 +35,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 +47,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
@@ -100,7 +104,7 @@ Options:
 # }}}}
 
 # execute grml2usb with all ISOs you'd like to install {{{
-  $GRML2USB "${GRML2USB_PARAMS}" "$@" "$WRKDIR/cddir"
+  $GRML2USB "${REMOVE_OPTS[@]}" ${ADD_OPTS:+"$ADD_OPTS"} "$@" "$WRKDIR/cddir"
 # }}}
 
 # move syslinux to isolinux {{{