From 3e57fc3074902571408e26fcbd0a484f5dab2e3f Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Thu, 12 Dec 2019 12:07:01 +0100 Subject: [PATCH] - skip BOOT_IMAGE param when copying the cmdline to BLS snippets The bootloaders add a BOOT_IMAGE parameter that is present in the kernel command line exposed via the /proc/cmdline virtual file. If this param is added to the kernel cmdline in the BLS snippet, it will be duplicated. Resolves: #1782321 --- 20-zipl-kernel.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/20-zipl-kernel.install b/20-zipl-kernel.install index 41ff2e5..99bfcb9 100755 --- a/20-zipl-kernel.install +++ b/20-zipl-kernel.install @@ -83,7 +83,7 @@ case "$COMMAND" in if ! [[ ${BOOT_OPTIONS[*]} ]]; then read -r -d '' -a line < /proc/cmdline for i in "${line[@]}"; do - [[ "${i#initrd=*}" != "$i" ]] && continue + [[ "${i#initrd=*}" != "$i" || "${i#BOOT_IMAGE=*}" != "$i" ]] && continue BOOT_OPTIONS+=("$i") done fi