make-initrd: Reorder arguments and make variables in the command line

Some users use the make feature that allows to override makefile
variables via command line.

In this case, the order in which arguments and variables are specified
is important because the make-initrd utility analyzes its arguments.

Correct order:

  make-initrd uki UKI_FEATURES=foo UKI_IMAGEFILE=/tmp/uki.efi

Bad order:

  make-initrd UKI_FEATURES=foo UKI_IMAGEFILE=/tmp/uki.efi uki

To avoid such issues it is necessary to reorder the arguments and move
the variables after the normal arguments.

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

utils/make-initrd/make-initrd.in

@@ -150,6 +150,18 @@ while :; do
 	shift
 done
 
+args=()
+vars=()
+
+for a in "$@"; do
+	case "$a" in
+		[!=]*=*) vars+=("$a") ;;
+		*)       args+=("$a") ;;
+	esac
+done
+
+set -- "${args[@]}"
+
 case "${1-}" in
 	guess-config|bug-report)
 		;;
@@ -249,4 +261,4 @@ case "$make_version" in
 esac
 
 make $output_sync --no-print-directory -r \
-	-f @projectdir@/mk/main.mk -- "$@" 4>&1 >&2
+	-f @projectdir@/mk/main.mk -- "$@" "${vars[@]}" 4>&1 >&2