For the following scripts, cmdline="root=/dev/mapper/rhel-root rd.lvm.lv=rhel/root quiet" remove_cmdline_param $cmdline "root" we will get the result "rd.lvm.lv=rhel/ quiet", after this patch we can get the correct "rd.lvm.lv=rhel/root quiet". Signed-off-by: Xunlei Pang <xlpang(a)redhat.com&gt; --- kdumpctl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kdumpctl b/kdumpctl index 4d68be0..b9ff268 100755 --- a/kdumpctl +++ b/kdumpctl @@ -69,7 +69,8 @@ remove_cmdline_param() for arg in $@; do cmdline=`echo $cmdline | \ sed -e "s/\b$arg=[^ ]*\b//g" \ - -e "s/\b$arg\b//g" \ + -e "s/^$arg\b//g" \ + -e "s/[[:space:]]$arg\b//g" \ -e "s/\s\+/ /g"` done echo $cmdline -- 1.8.3.1

After removing "root=X" we add the root mount information explicitly from the kdump side, so we need this change to avoid rebuild when the dump target is root. Signed-off-by: Xunlei Pang <xlpang(a)redhat.com&gt; --- kdumpctl | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kdumpctl b/kdumpctl index 09901fd..db38879 100755 --- a/kdumpctl +++ b/kdumpctl @@ -512,11 +512,16 @@ check_dump_fs_modified() fi fi - if ! findmnt $_target >/dev/null; then - echo "Dump target $_target is probably not mounted." - return 2 - fi - _new_mntpoint="/kdumproot/$(get_mntpoint_from_target $_target)" + if ! findmnt $_target >/dev/null; then + echo "Dump target $_target is probably not mounted." + return 2 + fi + + if [[ "$_target" = "$(get_root_fs_device)" ]]; then + _new_mntpoint="/sysroot/$(get_mntpoint_from_target $_target)" + else + _new_mntpoint="/kdumproot/$(get_mntpoint_from_target $_target)" + fi _dracut_args=$(lsinitrd $TARGET_INITRD | grep "^Arguments:" | head -1) if [[ -z "$_dracut_args" ]];then -- 1.8.3.1

This reverts commit 892bea7aa We already eliminated the root filesystem by removing "root=X", so it's time to revert this commit. Signed-off-by: Xunlei Pang <xlpang(a)redhat.com&gt; --- kdumpctl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kdumpctl b/kdumpctl index db38879..baadbd5 100755 --- a/kdumpctl +++ b/kdumpctl @@ -179,10 +179,6 @@ prepare_cmdline() if [ -z "$KDUMP_COMMANDLINE" ]; then cmdline=`cat /proc/cmdline` - # 'root' parameter will cause kdump failure in live images - if [[ ${cmdline} == *"root=live:"* ]]; then - KDUMP_COMMANDLINE_REMOVE="${KDUMP_COMMANDLINE_REMOVE} root" - fi else cmdline=${KDUMP_COMMANDLINE} fi -- 1.8.3.1

We add a generic hook named kdump_target_hook() for the dump target, this is useful for us to do some extra work for different types of dump targets. kdump_target_check() is exported as a generic helper that can be used as some specific purpose. We will use this mechanism in the following patch. Signed-off-by: Xunlei Pang <xlpang(a)redhat.com&gt; --- kdump-lib.sh | 13 ++++++++++ mkdumprd | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/kdump-lib.sh b/kdump-lib.sh index 0f74b8e..aafa21e 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -418,3 +418,16 @@ is_fadump_capable() fi return 1 } + +# $1: item +# Did the item left a tag in the inventory? +# return: 0 means surely left; 1 means surely not +kdump_target_check() +{ + local item=$1 tag + + tag=$(eval echo '${KDUMP_TARGET_TAG_'${item}'}') + [ -n "$tag" ] && return 0 + + return 1 +} diff --git a/mkdumprd b/mkdumprd index 892e59a..392eb7f 100644 --- a/mkdumprd +++ b/mkdumprd @@ -11,6 +11,9 @@ . /lib/kdump/kdump-lib.sh export IN_KDUMP=1 +# See kdump_target_XXX() +KDUMP_TARGET_CHECKLIST="" + conf_file="/etc/kdump.conf" SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" SAVE_PATH=$(grep ^path $conf_file| cut -d' ' -f2) @@ -250,6 +253,65 @@ add_mount() { add_dracut_mount "$_mnt" } +# $1: ssh, nfs, or block dev name +kdump_target_hook() +{ + local dev=$1 + + # Do not support fadump currently + if is_fadump_capable; then + return + fi + + # Ignore non-block device currently + if ! [ -b "$dev" ]; then + return + fi + + dev=$(get_persistent_dev $dev) + kdump_target_checklist "$KDUMP_TARGET_CHECKLIST" $dev +} + +# $1: items to be checked +# $2: persistent block dev name +kdump_target_checklist() +{ + local items=$1 pdev=$2 + + for item in $items; do + kdump_target_handle $item $pdev + done +} + +# $1: the item to be checked +# $2: persistent block dev name +# +# You can add an item in KDUMP_TARGET_CHECKLIST, handle it here +# and leave its tag(KDUMP_TARGET_TAG_$item) in the tag inventory +# as needed. +kdump_target_handle() +{ + local item=$1 pdev=$2 + local tag + + tag=KDUMP_TARGET_TAG_$item + # the item handling begins + case "$item" in + *) + echo "unhandled item in kdump target checklist" + return + esac + + kdump_target_leave_tag $tag +} + +# Leave the tag in the tag inventory. +# $1: tag +kdump_target_leave_tag() +{ + eval export $1=1 +} + get_block_dump_target() { local _target @@ -291,6 +353,8 @@ handle_default_dump_target() _fstype=$(get_fs_type_from_target $_target) add_mount "$_target" check_size fs $_target + + kdump_target_hook $_target } get_default_action_target() @@ -459,6 +523,12 @@ do add_mount "$config_val" check_save_path_fs $_absolute_save_path check_size fs $config_val + + if [ $config_opt = "nfs" ]; then + kdump_target_hook "nfs" + else + kdump_target_hook $config_val + fi ;; raw) #checking raw disk writable @@ -471,6 +541,7 @@ do fi add_dracut_arg "--device" "$_praw" check_size raw $config_val + kdump_target_hook $_praw ;; ssh) if strstr "$config_val" "@"; @@ -478,7 +549,8 @@ do check_size ssh $config_val mkdir_save_path_ssh $config_val add_dracut_module "ssh-client" - add_dracut_sshkey "$SSH_KEY_LOCATION" + add_dracut_sshkey "$SSH_KEY_LOCATION" + kdump_target_hook "ssh" else perror_exit "Bad ssh dump target $config_val" fi @@ -488,6 +560,16 @@ do ;; dracut_args) add_dracut_arg $config_val + + dracut_args_dev=$(get_dracut_args_target "$config_val") + if [ -n "$dracut_args_dev" ]; then + dracut_args_fstype=$(get_dracut_args_fstype "$config_val") + if is_fs_type_nfs $dracut_args_fstype ; then + kdump_target_hook "nfs" + else + kdump_target_hook $dracut_args_dev + fi + fi ;; *) if [ -n $(echo $config_opt | grep "^#.*$") ] -- 1.8.3.1

We can easily achieve this by adding "lvm" in the checklist. We need do this, because in case of "nfs" dumping, if "lvm" is added, the lvm2 under kdump still operates the lvm volume due to the "rd.lvm.lv=X" inherited from the first kernel. This patch removes "lvm" from the kdump initramfs in case of no lvm target, it can reduce several megabytes from initramfs. Signed-off-by: Xunlei Pang <xlpang(a)redhat.com&gt; --- mkdumprd | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mkdumprd b/mkdumprd index 38b3f12..4eb0dea 100644 --- a/mkdumprd +++ b/mkdumprd @@ -12,7 +12,7 @@ export IN_KDUMP=1 # See kdump_target_XXX() -KDUMP_TARGET_CHECKLIST="lvmlinear" +KDUMP_TARGET_CHECKLIST="lvm lvmlinear" conf_file="/etc/kdump.conf" SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" @@ -297,6 +297,11 @@ kdump_target_handle() tag=KDUMP_TARGET_TAG_$item # the item handling begins case "$item" in + lvm) + if ! [[ $pdev =~ "/dev/mapper/" ]]; then + return + fi + ;; lvmlinear) if ! [[ $pdev =~ "/dev/mapper/" ]]; then return @@ -596,6 +601,11 @@ then add_dracut_arg "--add-drivers" "$extra_modules" fi +# Omit "lvm" dracut module if we have no lvm target. +if ! kdump_target_check lvm ; then + add_dracut_arg "-o" "lvm" +fi + dracut "${dracut_args[@]}" "$@" _rc=$? sync -- 1.8.3.1