From bf5b3da107c4fd843ba0736f50323df0d2950ae3 Mon Sep 17 00:00:00 2001 From: Xunlei Pang Date: Wed, 5 Apr 2017 19:34:11 +0800 Subject: [PATCH] kdumpctl: fix a bug in remove_cmdline_param() For the following scripts: cmdline="root=/dev/mapper/fedora-root rd.lvm.lv=fedora/root rw" remove_cmdline_param $cmdline "root" cmdline="root=nfs4:192.168.122.9:/ ip=ens3:dhcp rw" remove_cmdline_param $cmdline "root" The current implementation will get the wrong results: "rd.lvm.lv=fedora/ rw" ":/ ip=ens3:dhcp rw" After this patch we can get the correct results: "rd.lvm.lv=fedora/root rw" "ip=ens3:dhcp rw" Signed-off-by: Xunlei Pang Acked-by: Pratyush Anand Acked-by:Dave Young --- kdumpctl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kdumpctl b/kdumpctl index 9afce8f..b5adec3 100755 --- a/kdumpctl +++ b/kdumpctl @@ -68,8 +68,9 @@ remove_cmdline_param() for arg in $@; do cmdline=`echo $cmdline | \ - sed -e "s/\b$arg=[^ ]*\b//g" \ - -e "s/\b$arg\b//g" \ + sed -e "s/\b$arg=[^ ]*//g" \ + -e "s/^$arg\b//g" \ + -e "s/[[:space:]]$arg\b//g" \ -e "s/\s\+/ /g"` done echo $cmdline