d2f21f374d
Resolves: https://issues.redhat.com/browse/RHEL-138697 Conflict: None commit 48dd252bf8cc75c696d5d7e9a07efc838e3aad66 Author: Philipp Rudo <prudo@redhat.com> Date: Tue Sep 2 13:28:32 2025 +0200 spec: drop dependency for binutils The binutils were added as dependency to support UKIs. With the main part of the UKI support been moved to kexec-tools only one spot remains in prepare_kdump_bootinfo where they are used. Refractor prepare_kdump_bootinfo to get rid of the dependency. This slightly changes the behavior for UKIs. In particular the kdump initrd is moved from /boot to /var/lib/kdump. While at it also simplify the logic in prepare_kdump_bootinfo as it is unnecessarily complex and can lead to weird corner cases. For example if the default initrd is located at /boot/$machine_id/$kernel_version/initrd and the directory is not writable, then the kdump initrd would be stored at /var/lib/kdump/initrdkdump without any information about the kernel version. This can lead to all sorts of problems when multiple kernel versions are installed. Thus always use initramfs-${kernel_version}kdump.img when the initrd is stored at /var/lib/kdump. Update 60-kdump.install accordingly. Signed-off-by: Philipp Rudo <prudo@redhat.com> Signed-off-by: Coiby Xu <coxu@redhat.com>
104 lines
3.4 KiB
Diff
104 lines
3.4 KiB
Diff
From 9d716888ac9b0a2e47bc6728a74013ade0da072e Mon Sep 17 00:00:00 2001
|
|
From: Philipp Rudo <prudo@redhat.com>
|
|
Date: Tue, 19 Aug 2025 12:13:40 +0200
|
|
Subject: [PATCH] kdumpctl: clean up {backup,restore}_default_initrd
|
|
|
|
The sha1 algorithm used is no longer considered secure. In addition the
|
|
shaXsum commands have a --check option that reads checksums stored in a
|
|
file and verifies them. So there is no need for the home grown
|
|
verification in restore_default_initrd.
|
|
|
|
While at it refractor the two functions slightly to increase their
|
|
readability and add additional debug messages.
|
|
|
|
Signed-off-by: Philipp Rudo <prudo@redhat.com>
|
|
Signed-off-by: Coiby Xu <coxu@redhat.com>
|
|
---
|
|
kdumpctl | 54 ++++++++++++++++++++++++++++++++----------------------
|
|
1 file changed, 32 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/kdumpctl b/kdumpctl
|
|
index 13f341f..2d2c81a 100755
|
|
--- a/kdumpctl
|
|
+++ b/kdumpctl
|
|
@@ -243,19 +243,22 @@ backup_default_initrd()
|
|
ddebug "backup default initrd: $DEFAULT_INITRD"
|
|
|
|
if [[ ! -f $DEFAULT_INITRD ]]; then
|
|
+ ddebug "\$DEFAULT_INITRD=$DEFAULT_INITRD does not exist"
|
|
return
|
|
fi
|
|
|
|
- if [[ ! -e $DEFAULT_INITRD_BAK ]]; then
|
|
- dinfo "Backing up $DEFAULT_INITRD before rebuild."
|
|
- # save checksum to verify before restoring
|
|
- sha1sum "$DEFAULT_INITRD" > "$INITRD_CHECKSUM_LOCATION"
|
|
- if ! cp "$DEFAULT_INITRD" "$DEFAULT_INITRD_BAK"; then
|
|
- dwarn "WARNING: failed to backup $DEFAULT_INITRD."
|
|
- rm -f -- "$INITRD_CHECKSUM_LOCATION"
|
|
- rm -f -- "$DEFAULT_INITRD_BAK"
|
|
- fi
|
|
+ if [[ -f $DEFAULT_INITRD_BAK ]]; then
|
|
+ ddebug "\$DEFAULT_INITRD_BAK=$DEFAULT_INITRD_BAK already exist"
|
|
+ return
|
|
+ fi
|
|
+
|
|
+ dinfo "Backing up $DEFAULT_INITRD before rebuild."
|
|
+ if ! cp "$DEFAULT_INITRD" "$DEFAULT_INITRD_BAK"; then
|
|
+ dwarn "WARNING: failed to backup $DEFAULT_INITRD."
|
|
+ rm -f -- "$DEFAULT_INITRD_BAK"
|
|
+ return
|
|
fi
|
|
+ sha512sum "$DEFAULT_INITRD_BAK" > "$INITRD_CHECKSUM_LOCATION"
|
|
}
|
|
|
|
restore_default_initrd()
|
|
@@ -263,24 +266,31 @@ restore_default_initrd()
|
|
ddebug "restore default initrd: $DEFAULT_INITRD"
|
|
|
|
if [[ ! -f $DEFAULT_INITRD ]]; then
|
|
+ ddebug "\$DEFAULT_INITRD=$DEFAULT_INITRD does not exist"
|
|
+ return
|
|
+ fi
|
|
+
|
|
+ if [[ ! -f $DEFAULT_INITRD_BAK ]]; then
|
|
+ ddebug "\$DEFAULT_INITRD_BAK=$DEFAULT_INITRD_BAK does not exist"
|
|
+ return
|
|
+ fi
|
|
+
|
|
+ if [[ ! -f $INITRD_CHECKSUM_LOCATION ]]; then
|
|
+ ddebug "\$INITRD_CHECKSUM_LOCATION=$INITRD_CHECKSUM_LOCATION does not exist"
|
|
return
|
|
fi
|
|
|
|
# If a backup initrd exists, we must be switching back from
|
|
# fadump to kdump. Restore the original default initrd.
|
|
- if [[ -f $DEFAULT_INITRD_BAK ]] && [[ -f $INITRD_CHECKSUM_LOCATION ]]; then
|
|
- # verify checksum before restoring
|
|
- backup_checksum=$(sha1sum "$DEFAULT_INITRD_BAK" | awk '{ print $1 }')
|
|
- default_checksum=$(awk '{ print $1 }' "$INITRD_CHECKSUM_LOCATION")
|
|
- if [[ $default_checksum != "$backup_checksum" ]]; then
|
|
- dwarn "WARNING: checksum mismatch! Can't restore original initrd.."
|
|
- else
|
|
- rm -f "$INITRD_CHECKSUM_LOCATION"
|
|
- if mv "$DEFAULT_INITRD_BAK" "$DEFAULT_INITRD"; then
|
|
- derror "Restoring original initrd as fadump mode is disabled."
|
|
- sync -f "$DEFAULT_INITRD"
|
|
- fi
|
|
- fi
|
|
+ if ! sha512sum --status --check "$INITRD_CHECKSUM_LOCATION"; then
|
|
+ dwarn "WARNING: checksum mismatch! Can't restore original initrd."
|
|
+ return
|
|
+ fi
|
|
+
|
|
+ rm -f "$INITRD_CHECKSUM_LOCATION"
|
|
+ if mv "$DEFAULT_INITRD_BAK" "$DEFAULT_INITRD"; then
|
|
+ derror "Restoring original initrd as fadump mode is disabled."
|
|
+ sync -f "$DEFAULT_INITRD"
|
|
fi
|
|
}
|
|
|
|
--
|
|
2.52.0
|
|
|