From ff79065804129b8635e61a704e89efae7bb4687f Mon Sep 17 00:00:00 2001 From: zhangjian Date: Wed, 20 Aug 2025 06:42:12 +0000 Subject: [PATCH] support mkdumprd for btrfs --- mkdumprd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mkdumprd b/mkdumprd index 35f5eed..15d5961 100644 --- a/mkdumprd +++ b/mkdumprd @@ -53,7 +53,7 @@ add_dracut_sshkey() { to_mount() { local _dev=$1 _source _target _fstype _options _mntopts _pdev - _source=$(findmnt -k -f -n -r -o SOURCE $_dev) + _source=$(findmnt -v -k -f -n -r -o SOURCE $_dev) _target=$(get_mntpoint_from_target $_dev) # mount under /sysroot if dump to root disk or mount under #/kdumproot/$_target in other cases in 2nd kernel. systemd @@ -65,10 +65,10 @@ to_mount() { _target="/kdumproot/$_target" fi - _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev) - [[ -e /etc/fstab ]] && _options=$(findmnt --fstab -f -n -r -o OPTIONS $_dev) + _fstype=$(findmnt -v -k -f -n -r -o FSTYPE $_dev) + [[ -e /etc/fstab ]] && _options=$(findmnt -v --fstab -f -n -r -o OPTIONS $_dev) if [ -z "$_options" ]; then - _options=$(findmnt -k -f -n -r -o OPTIONS $_dev) + _options=$(findmnt -v -k -f -n -r -o OPTIONS $_dev) if [[ $_fstype == "nfs"* ]]; then _options=$(echo $_options | sed 's/,addr=[^,]*//') _options=$(echo $_options | sed 's/,proto=[^,]*//') @@ -102,7 +102,7 @@ to_mount() { is_readonly_mount() { local _mnt - _mnt=$(findmnt -k -f -n -r -o OPTIONS $1) + _mnt=$(findmnt -v -k -f -n -r -o OPTIONS $1) #fs/proc_namespace.c: show_mountinfo(): #seq_puts(m, mnt->mnt_flags & MNT_READONLY ? " ro" : " rw"); @@ -374,7 +374,7 @@ do extra_modules="$extra_modules $config_val" ;; ext[234]|xfs|btrfs|minix|nfs) - if ! findmnt $config_val >/dev/null; then + if ! findmnt -v $config_val >/dev/null; then perror_exit "Dump target $config_val is probably not mounted." fi -- Gitee