diff --git a/kexec-tools.spec b/kexec-tools.spec index 841c8d9..cb4987c 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -113,6 +113,7 @@ Requires: systemd-udev%{?_isa} # # Patches 601 onward are generic patches # +Patch601: kexec-update-manpage-with-explicit-mention-of-clean-.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -128,6 +129,8 @@ mkdir -p -m755 kcp tar -z -x -v -f %{SOURCE9} tar -z -x -v -f %{SOURCE19} +%patch601 -p1 + %ifarch ppc %define archdef ARCH=ppc %endif diff --git a/kexec-update-manpage-with-explicit-mention-of-clean-.patch b/kexec-update-manpage-with-explicit-mention-of-clean-.patch new file mode 100644 index 0000000..d7b674a --- /dev/null +++ b/kexec-update-manpage-with-explicit-mention-of-clean-.patch @@ -0,0 +1,39 @@ +From bd0200c47c45dd420244b39ddabcecdab1fb9a8e Mon Sep 17 00:00:00 2001 +From: Hari Bathini +Date: Wed, 20 Sep 2023 17:29:27 +0530 +Subject: [PATCH] kexec: update manpage with explicit mention of clean kexec + +While the manpage does mention about kexec boot with a clean shutdown, +it is not explicit about it. Make it explicit. + +Signed-off-by: Hari Bathini +Signed-off-by: Simon Horman +--- + kexec/kexec.8 | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/kexec/kexec.8 b/kexec/kexec.8 +index 3a344c5..179dcf2 100644 +--- a/kexec/kexec.8 ++++ b/kexec/kexec.8 +@@ -95,8 +95,15 @@ then you would use the following command to load the kernel: + .RB "\-\-append=" "root=/dev/hda1" "\ \-\-initrd=" /boot/initrd + .RE + .PP +-After this kernel is loaded, it can be booted to at any time using the +-command: ++After this kernel is loaded, assuming the user-space supports kexec-based ++rebooting, it can be booted to, with a clean shutdown, using the command: ++ ++.RS ++.BR reboot ++.RE ++.PP ++Alternatively, it can also be booted to, without calling shutdown(8), with ++the command: + + .RS + .BR kexec \ \-e +-- +2.41.0 +