rpms/kexec-tools
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdumpctl: add rebuild support

Browse Source 
Use "kdumpctl rebuild" to rebuild the image directly. This could help
admins to rebuild kdump image directly.

Also merge fadump related initramfs backup/restore into setup_initrd,
and do permission only when actually trying to rebuild the image.

Signed-off-by: Kairui Song <kasong@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
This commit is contained in:
Kairui Song 2019-03-29 11:29:30 +08:00
parent 289e16c881
commit 594ac119c5
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
kdumpctl
View File

@ -123,6 +123,11 @@ rebuild_kdump_initrd()
rebuild_initrd() rebuild_initrd()
{ {
if [[ ! -w "$KDUMP_BOOTDIR" ]];then
echo "$KDUMP_BOOTDIR does not have write permission. Can not rebuild $TARGET_INITRD"
return 1
fi
if [ $DEFAULT_DUMP_MODE == "fadump" ]; then if [ $DEFAULT_DUMP_MODE == "fadump" ]; then
rebuild_fadump_initrd rebuild_fadump_initrd
else else
@ -298,12 +303,17 @@ setup_initrd()
DEFAULT_INITRD_BAK="${KDUMP_BOOTDIR}/.initramfs-`uname -r`.img.default" DEFAULT_INITRD_BAK="${KDUMP_BOOTDIR}/.initramfs-`uname -r`.img.default"
if [ $DEFAULT_DUMP_MODE == "fadump" ]; then if [ $DEFAULT_DUMP_MODE == "fadump" ]; then
TARGET_INITRD="$DEFAULT_INITRD" TARGET_INITRD="$DEFAULT_INITRD"
if [ ! -s "$TARGET_INITRD" ]; then
echo "Error: No initrd found to rebuild!" # backup initrd for reference before replacing it
return 1 # with fadump aware initrd
fi backup_default_initrd
else else
TARGET_INITRD="${KDUMP_BOOTDIR}/initramfs-${kdump_kver}kdump.img" TARGET_INITRD="${KDUMP_BOOTDIR}/initramfs-${kdump_kver}kdump.img"
# check if a backup of default initrd exists. If yes,
# it signifies a switch from fadump mode. So, restore
# the backed up default initrd.
restore_default_initrd
fi fi
} }
@ -602,8 +612,6 @@ check_rebuild()
system_modified="1" system_modified="1"
fi fi
handle_mode_switch
if [ $image_time -eq 0 ]; then if [ $image_time -eq 0 ]; then
echo -n "No kdump initial ramdisk found."; echo echo -n "No kdump initial ramdisk found."; echo
elif [ "$capture_capable_initrd" == "0" ]; then elif [ "$capture_capable_initrd" == "0" ]; then
@ -616,11 +624,6 @@ check_rebuild()
return 0 return 0
fi fi
if [[ ! -w "$KDUMP_BOOTDIR" ]];then
echo "$KDUMP_BOOTDIR does not have write permission. Can not rebuild $TARGET_INITRD"
return 1
fi
echo "Rebuilding $TARGET_INITRD" echo "Rebuilding $TARGET_INITRD"
rebuild_initrd rebuild_initrd
return $? return $?
@ -745,20 +748,6 @@ show_reserved_mem()
echo "Reserved "$mem_mb"MB memory for crash kernel" echo "Reserved "$mem_mb"MB memory for crash kernel"
} }
handle_mode_switch()
{
if [ "$DEFAULT_DUMP_MODE" == "fadump" ]; then
# backup initrd for reference before replacing it
# with fadump aware initrd
backup_default_initrd
else
# check if a backup of default initrd exists. If yes,
# it signifies a switch from fadump mode. So, restore
# the backed up default initrd.
restore_default_initrd
fi
}
check_current_fadump_status() check_current_fadump_status()
{ {
# Check if firmware-assisted dump has been registered. # Check if firmware-assisted dump has been registered.
@ -1141,6 +1130,17 @@ stop()
return 0 return 0
} }
rebuild() {
setup_initrd
if [ $? -ne 0 ]; then
return 1
fi
echo "Rebuilding $TARGET_INITRD"
rebuild_initrd
return $?
}
if [ ! -f "$KDUMP_CONFIG_FILE" ]; then if [ ! -f "$KDUMP_CONFIG_FILE" ]; then
echo "Error: No kdump config file found!" >&2 echo "Error: No kdump config file found!" >&2
exit 1 exit 1
@ -1185,6 +1185,9 @@ main ()
stop stop
start start
;; ;;
rebuild)
rebuild
;;
condrestart) condrestart)
;; ;;
propagate) propagate)
@ -1194,7 +1197,7 @@ main ()
show_reserved_mem show_reserved_mem
;; ;;
*) *)
echo $"Usage: $0 {start|stop|status|restart|reload|propagate|showmem}" echo $"Usage: $0 {start|stop|status|restart|reload|rebuild|propagate|showmem}"
exit 1 exit 1
esac esac
} }