From 86cdbeb5aa1fe93f99caaa085aceba27b08c471c Mon Sep 17 00:00:00 2001 From: Oguz Bektas Date: Wed, 16 Oct 2019 13:17:31 +0200 Subject: [PATCH] fix #2403: exclude initrd entries from /proc/cmdline if we fallback to /proc/cmdline, it can include the booted initrd. to avoid loader entries with initrd 'options' lines, we have to parse them out. Signed-off-by: Oguz Bektas --- efiboot/zz-pve-efiboot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/efiboot/zz-pve-efiboot b/efiboot/zz-pve-efiboot index 4756555..8771da9 100755 --- a/efiboot/zz-pve-efiboot +++ b/efiboot/zz-pve-efiboot @@ -50,7 +50,8 @@ update_esps() { CMDLINE="$(cat /etc/kernel/cmdline)" else warn "No /etc/kernel/cmdline found - falling back to /proc/cmdline" - CMDLINE="$(cat /proc/cmdline)" + # remove initrd entries + CMDLINE="$(awk '{gsub(/\yinitrd=([0-9a-zA-Z\/\\._-])*\s*/,x)}1' /proc/cmdline)" fi loop_esp_list update_esp_func