Hi Philipp,
This patch fails the nfs-early-kdump test (Fedora 36 cloud image). Since
"[PATCH v2 5/8] kdump-lib: remove get_nmcli_connection_apath_by_ifname"
is still good, this is the first bad commit.
I'm yet to figure out how it happens. The following logs may point to a
clue,
[ 1.469868] dracut-cmdline[252]: Using kernel command line parameters:
rd.driver.pre=btrfs BOOT_IMAGE=(hd0,gpt2)/vmlinuz-5.17.5-300.fc36.x86_64
root=UUID=737459fa-eab9-4d8f-9a14-c8c32d403c08 ro rootflags=subvol=root no_timer_check
net.ifnames=0 console=tty1 console=ttyS0,115200n8 systemd.journald.forward_to_console=1
selinux=0 crashkernel=224M test_boot_count=2 rd.earlykdump
[ 1.484797] dracut-cmdline[252]: /lib/kdump-lib.sh: line 11:
/usr/lib/dracut/dracut-functions.sh: No such file or directory
On Mon, Apr 03, 2023 at 04:55:02PM +0200, Philipp Rudo wrote:
Drop the function in favor of the identical get_maj_min function from
dracut-functions.
Signed-off-by: Philipp Rudo <prudo(a)redhat.com>
---
kdump-lib.sh | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/kdump-lib.sh b/kdump-lib.sh
index 722616c..d7bb84b 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -7,6 +7,8 @@ if [[ ${__SOURCED__:+x} ]]; then
else
. /lib/kdump/kdump-lib-initramfs.sh
fi
+[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
+. $dracutbasedir/dracut-functions.sh
FADUMP_ENABLED_SYS_NODE="/sys/kernel/fadump_enabled"
FADUMP_REGISTER_SYS_NODE="/sys/kernel/fadump_registered"
@@ -852,24 +854,12 @@ get_luks_crypt_dev()
done
}
-# kdump_get_maj_min <device>
-# Prints the major and minor of a device node.
-# Example:
-# $ get_maj_min /dev/sda2
-# 8:2
-kdump_get_maj_min()
-{
- local _majmin
- _majmin="$(stat -L -c '%t:%T' "$1" 2> /dev/null)"
- printf "%s" "$((0x${_majmin%:*})):$((0x${_majmin#*:}))"
-}
-
get_all_kdump_crypt_dev()
{
local _dev
for _dev in $(get_block_dump_target); do
- get_luks_crypt_dev "$(kdump_get_maj_min "$_dev")"
+ get_luks_crypt_dev "$(get_maj_min "$_dev")"
done
}
--
2.39.2
_______________________________________________
kexec mailing list -- kexec(a)lists.fedoraproject.org
To unsubscribe send an email to kexec-leave(a)lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines:
https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
--
Best regards,
Coiby