From 577f109243bc96cd99c2b8204b7ca4426918f8ae Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@hoyer.xyz>

Date: Mon, 8 Jan 2018 13:31:55 +0100

Subject: [PATCH] Merge pull request #339 from danimo/fix_include_parsing

Fix parsing of "-i" and "--include"

---

 dracut.sh | 14 +++++++++-----

 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dracut.sh b/dracut.sh

index f5c8d74c..c857b624 100755

--- a/dracut.sh

+++ b/dracut.sh

@@ -286,11 +286,15 @@ dropindirs_sort()

 rearrange_params()

 {

     # Workaround -i, --include taking 2 arguments

-    set -- "${@/--include/++include}"

-

-    # This prevents any long argument ending with "-i"

-    # -i, like --opt-i but I think we can just prevent that

-    set -- "${@/%-i/++include}"

+    newat=()

+    for i in "$@"; do

+      if [[ $i == "-i" ]] || [[ $i == "--include" ]]; then

+            newat+=("++include") # Replace --include by ++include

+        else

+            newat+=("$i")

+        fi

+    done

+    set -- "${newat[@]}" # Set new $@

     TEMP=$(unset POSIXLY_CORRECT; getopt \

         -o "a:m:o:d:I:k:c:L:fvqlHhMN" \