From: Harald Hoyer <harald@redhat.com>
Date: Thu, 20 Jun 2013 13:46:37 +0000 (+0200)
Subject: kernel-install: filter out "initrd=" from /proc/cmdline
X-Git-Tag: v205~99
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6c10d3997019c4f09dad5650209b49c5ccd11551

kernel-install: filter out "initrd=" from /proc/cmdline
---

diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
index 55b4d2467..6fbb14908 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -38,15 +38,22 @@ if ! [[ $PRETTY_NAME ]]; then
     PRETTY_NAME="Linux $KERNEL_VERSION"
 fi
 
+declare -a BOOT_OPTIONS
+
 if [[ -f /etc/kernel/cmdline ]]; then
     readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
 fi
 
 if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-    readarray -t BOOT_OPTIONS < /proc/cmdline
+    readarray -t line < /proc/cmdline
+    for i in ${line[*]}; do
+        if [[ "${i#initrd=*}" == "$i" ]]; then
+            BOOT_OPTIONS[${#BOOT_OPTIONS[@]}]="$i"
+        fi
+    done
 fi
 
-if ! [[ $BOOT_OPTIONS ]]; then
+if ! [[ ${BOOT_OPTIONS[*]} ]]; then
     echo "Could not determine the kernel command line parameters." >&2
     echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
     exit 1