On 07/03/2017 at 01:21 PM, Dave Young wrote:
Hi Xunlei,
On 06/30/17 at 11:18am, Xunlei Pang wrote:
> This patch improves get_block_dump_target as follows:
> -Consider block device in the special "--dracut-args --mount ..."
> in get_user_configured_dump_disk().
> -Consider save path instead of root fs in get_block_dump_target(),
> and move it into kdump-lib.sh because we will have another user
> in the following patch.
> -For nfs/ssh dumping, there is no need to check the root device.
> -Move get_save_path into kdump-lib.sh.
>
> After this patch, get_block_dump_target() can always return the
> correct block dump target specified.
>
> Signed-off-by: Xunlei Pang <xlpang(a)redhat.com>
> ---
> kdump-lib.sh | 44 ++++++++++++++++++++++++++++++++++++--------
> kdumpctl | 10 ----------
> mkdumprd | 13 -------------
> 3 files changed, 36 insertions(+), 31 deletions(-)
>
> diff --git a/kdump-lib.sh b/kdump-lib.sh
> index 8ebad70..ae54b7f 100755
> --- a/kdump-lib.sh
> +++ b/kdump-lib.sh
> @@ -44,12 +44,6 @@ is_fs_dump_target()
> egrep -q "^ext[234]|^xfs|^btrfs|^minix" /etc/kdump.conf
> }
>
> -is_user_configured_dump_target()
> -{
> - return $(is_mount_in_dracut_args || is_ssh_dump_target || is_nfs_dump_target ||
\
> - is_raw_dump_target || is_fs_dump_target)
> -}
> -
> strip_comments()
> {
> echo $@ | sed -e 's/\(.*\)#.*/\1/'
> @@ -88,6 +82,12 @@ to_dev_name() {
> echo $dev
> }
>
> +is_user_configured_dump_target()
> +{
> + return $(is_mount_in_dracut_args || is_ssh_dump_target || is_nfs_dump_target ||
\
> + is_raw_dump_target || is_fs_dump_target)
> +}
> +
> get_user_configured_dump_disk()
> {
> local _target
> @@ -97,9 +97,10 @@ get_user_configured_dump_disk()
> fi
>
> _target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw" /etc/kdump.conf
2>/dev/null |awk '{print $2}')
> - [ -n "$_target" ] && echo $_target
> + [ -n "$_target" ] && echo $_target && return
>
> - return
> + _target=$(get_dracut_args_target "$(grep "^dracut_args
.*\-\-mount" /etc/kdump.conf)")
> + [ -b "$_target" ] && echo $_target
> }
>
> get_root_fs_device()
> @@ -111,6 +112,33 @@ get_root_fs_device()
> return
> }
>
> +get_save_path()
> +{
> + local _save_path=$(grep "^path" /etc/kdump.conf|awk '{print
$2}')
> + if [ -z "$_save_path" ]; then
> + _save_path=$DEFAULT_PATH
> + fi
> +
> + echo $_save_path
> +}
> +
> +get_block_dump_target()
> +{
> + local _target _path
> +
> + _target=$(get_user_configured_dump_disk)
> + [ -n "$_target" ] && echo $(to_dev_name $_target) &&
return
> +
> + if is_ssh_dump_target || is_nfs_dump_target; then
> + return
> + fi
Move ssh/nfs checking to the beginning should be better.
Otherwise the patch looks good.
OK, will do, thanks!