diff --git a/0004-remove-confirm-prompt-when-unloading-patches.patch b/0004-remove-confirm-prompt-when-unloading-patches.patch new file mode 100644 index 0000000000000000000000000000000000000000..d90dba2a26a8d1024b38bf08994eb775a1704d03 --- /dev/null +++ b/0004-remove-confirm-prompt-when-unloading-patches.patch @@ -0,0 +1,25 @@ +From 51808080d474112f3206a7aad94930d274c248e2 Mon Sep 17 00:00:00 2001 +From: "zhangyongde.zyd" +Date: Fri, 24 Feb 2023 17:36:20 +0800 +Subject: [PATCH] remove confirm prompt when unloading patches + +--- + kpatch/kpatch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kpatch/kpatch b/kpatch/kpatch +index 7506a05..aafa938 100755 +--- a/kpatch/kpatch ++++ b/kpatch/kpatch +@@ -470,7 +470,7 @@ case "$1" in + shift + ;; + "unload") +- confirm_prompt "WARNING: Red Hat doesn't support unloading of kpatches, continue anyway?" || exit 1 ++ echo "WARNING: Anolis don't suggest unloading of kpatches." || exit 1 + ;; + esac + +-- +2.37.0 (Apple Git-136) + diff --git a/kpatch.spec b/kpatch.spec index 552155e3869d453561b26a7a2aec19ad90565307..92cf82a99f0aa45d6b290c923899545fc52a38c2 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,8 +1,9 @@ %define kpatch_dnf_ver 0.4 +%define anolis_release .0.1 Name: kpatch Version: 0.9.4 -Release: 3%{?dist} +Release: 3%{anolis_release}%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -15,6 +16,7 @@ Source1: kpatch-dnf-v%{kpatch_dnf_ver}.tar.gz Patch0: 0001-contrib-disable-upstart-kpatch.conf-install.patch Patch1: 0002-kpatch-clarify-unload-unsupport.patch Patch2: 0003-do-not-rm-selinux-rpm-owned-directory.patch +Patch3: 0004-remove-confirm-prompt-when-unloading-patches.patch # Upstream backports #Patch100: 0100-xxx.patch @@ -51,6 +53,7 @@ kpatch-patch packages updates. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %setup -D -T -a 1 cd kpatch-dnf-%{kpatch_dnf_ver} @@ -88,6 +91,9 @@ echo -e "\t$ dnf kpatch auto" %changelog +* Sat Mar 04 2023 Yongde Zhang 0.9.4-3.0.1 +- Disable confirm prompt of kpatch script which may have nagative effect of unloading process + * Fri Jun 10 2022 Yannick Cote 0.9.4-3 - Do not rm selinux rpm owned directory (rhbz#2065609)