From fa6acbbc3f70e56bdd9be7dab5d86d4b845b5fcd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 23:08:00 +0200 Subject: [PATCH 01/18] Rebuilt for Python 3.12 --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 1bf5071..743c3d6 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: ASL 2.0 @@ -144,6 +144,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Wed Jun 14 2023 Python Maint - 1.0.5-2 +- Rebuilt for Python 3.12 + * Tue Apr 25 2023 David Duncan <> - 1.0.5-1 - Ensure we swapon the hibinit swapfile with the highest priority From 3c56a0a305aa7d5cbc001ae7484186ed1b66aa27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 18:10:50 +0000 Subject: [PATCH 02/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 743c3d6..5061a8d 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: ASL 2.0 @@ -144,6 +144,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 14 2023 Python Maint - 1.0.5-2 - Rebuilt for Python 3.12 From 2f29b08b0940ff4b3bf74a33b4e9506487f6bdfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:48:58 +0000 Subject: [PATCH 03/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 5061a8d..fb9d042 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: ASL 2.0 @@ -144,6 +144,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0bbca160b0b2f89434853813dea9c58b89d81035 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:05:40 +0000 Subject: [PATCH 04/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index fb9d042..60b3273 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: ASL 2.0 @@ -144,6 +144,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ff1a7e438682d94f1af4c036e2340b867a8d02d9 Mon Sep 17 00:00:00 2001 From: Dominik Wombacher Date: Mon, 8 Apr 2024 09:42:45 +0000 Subject: [PATCH 05/18] feat: Update to 1.0.8 and migrated to SPDX v1.0.8, Graceful Termination Improvements - Critical termination protection v1.0.7, Btrfs Support for hibernation - Change message when removing SWAP - Adding btrfs-enabled to set No_COW and get offset using btrfs v1.0.6 - Add initial Amazon Linux 2022 support - Add pm-utils for required package - Recreating the swap file if the current size is sufficiently larger - Update /sys/power/resume_offset and /sys/power/resume only if present --- .gitignore | 1 + ec2-hibinit-agent.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d1d0df8..d940b6e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.~undo-tree~ amazon-ec2-hibinit-agent.spec /ec2-hibinit-agent-1.0.5.tar.gz +/ec2-hibinit-agent-1.0.8.tar.gz diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 60b3273..99417cc 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -11,11 +11,11 @@ %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done; Name: ec2-hibinit-agent -Version: 1.0.5 -Release: 5%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: Hibernation setup utility for Amazon EC2 -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/aws/amazon-%{name} Source0: https://github.com/aws/%{project}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -144,6 +144,10 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Mon Apr 8 2024 Dominik Wombacher - 1.0.8-1 +- Update to 1.0.8 +- migrated to SPDX license + * Wed Jan 24 2024 Fedora Release Engineering - 1.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 60c6846..e0c7e00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ec2-hibinit-agent-1.0.5.tar.gz) = e6201d006fc18a6fab06bd4026333b7e5310511560ff237e724262a12d60f73f507bf314d224059d314705899aaf3c4d10226dbce776e797c03ee4b0ab819982 +SHA512 (ec2-hibinit-agent-1.0.8.tar.gz) = a0ea22a268a236eea9a2a510ce393c8933600984bd7b1c532ebbebccaefe26ec84b6288f9822aa32a64056f6c4f5445e332f5d5864b4b6668713a60ec7d42f51 From f2bc9f24ee9398d1adab307a2293065b716c3b49 Mon Sep 17 00:00:00 2001 From: Dominik Wombacher Date: Mon, 6 May 2024 12:34:01 +0000 Subject: [PATCH 06/18] feat: Packit onboarding --- .packit.yaml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..1046338 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,41 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +upstream_project_url: https://github.com/aws/amazon-ec2-hibinit-agent +upstream_package_name: amazon-ec2-hibinit-agent +downstream_package_name: ec2-hibinit-agent + +jobs: + - job: pull_from_upstream + trigger: release + # Keeping dist-git branches non-divergent + # Requirs manual local merge from rawhide to stable release branches + # https://packit.dev/docs/fedora-releases-guide#keeping-dist-git-branches-non-divergent + dist_git_branches: + - fedora-rawhide + + - job: koji_build + trigger: commit + allowed_pr_authors: + - packit + - all_admins + - all_committers + - '@cloud-sig' # string with @ needs quotes to be valid yaml + allowed_committers: + - all_admins + - all_committers + - '@cloud-sig' # string with @ needs quotes to be valid yaml + dist_git_branches: + - fedora-all + - epel-all + + - job: bodhi_update + trigger: commit + allowed_builders: + - packit + - all_admins + - all_committers + - '@cloud-sig' # string with @ needs quotes to be valid yaml + dist_git_branches: + - fedora-branched # rawhide updates are created automatically + - epel-all From 32c76d1f5c7be63306a1de8dfdf5d24cbc6cc39c Mon Sep 17 00:00:00 2001 From: Dominik Wombacher Date: Sun, 2 Jun 2024 10:03:10 +0000 Subject: [PATCH 07/18] fix(Packit): Set 'upstream_tag_template' because of 'ERROR Cannot checkout release tag.' in latest Packit Job. --- .packit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.packit.yaml b/.packit.yaml index 1046338..6dfe3a6 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,6 +2,7 @@ # https://packit.dev/docs/configuration/ upstream_project_url: https://github.com/aws/amazon-ec2-hibinit-agent +upstream_tag_template: v{version} upstream_package_name: amazon-ec2-hibinit-agent downstream_package_name: ec2-hibinit-agent From c6fb8d2397fa395f54541e6055ac618b1b9f3928 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 2 Jun 2024 10:04:57 +0000 Subject: [PATCH 08/18] Update to 1.0.9 upstream release Upstream tag: v1.0.9 Upstream commit: 527a5f69 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ ec2-hibinit-agent.spec | 5 ++++- sources | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index d940b6e..0b85970 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ amazon-ec2-hibinit-agent.spec /ec2-hibinit-agent-1.0.5.tar.gz /ec2-hibinit-agent-1.0.8.tar.gz +/ec2-hibinit-agent-1.0.9.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..2fa216c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.97.1.post1.dev4+g1268842e. diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 99417cc..bcb529e 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -11,7 +11,7 @@ %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done; Name: ec2-hibinit-agent -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} Summary: Hibernation setup utility for Amazon EC2 @@ -144,6 +144,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Sun Jun 02 2024 Packit - 1.0.9-1 +- Update to version 1.0.9 + * Mon Apr 8 2024 Dominik Wombacher - 1.0.8-1 - Update to 1.0.8 - migrated to SPDX license diff --git a/sources b/sources index e0c7e00..607710a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ec2-hibinit-agent-1.0.8.tar.gz) = a0ea22a268a236eea9a2a510ce393c8933600984bd7b1c532ebbebccaefe26ec84b6288f9822aa32a64056f6c4f5445e332f5d5864b4b6668713a60ec7d42f51 +SHA512 (ec2-hibinit-agent-1.0.9.tar.gz) = a056f3cf19775f1dca2079bf810d3a73cb0ddd4ad9de585e5878b5061683fc271577c02cf85a4332510f9e958bc84180a0a559a2f3f5de6c215002336b31f155 From fbeb0c13bf1dc61aa20f02ed0e3f814645dafe57 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 18:57:16 +0200 Subject: [PATCH 09/18] Rebuilt for Python 3.13 --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index bcb529e..ddb1ee1 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -144,6 +144,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Fri Jun 07 2024 Python Maint - 1.0.9-2 +- Rebuilt for Python 3.13 + * Sun Jun 02 2024 Packit - 1.0.9-1 - Update to version 1.0.9 From de7514a8ee9998cd234ffce47d90c6b7b0ff7808 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:40:34 +0000 Subject: [PATCH 10/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index ddb1ee1..026f627 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -144,6 +144,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.0.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 1.0.9-2 - Rebuilt for Python 3.13 From c8eb6a5d671336d2d6c13e7040ccf045e2d93e95 Mon Sep 17 00:00:00 2001 From: Dominik Wombacher Date: Fri, 8 Nov 2024 09:22:19 +0000 Subject: [PATCH 11/18] fix: Ensure swapon with maximum priority before hibernation Refs: https://github.com/aws/amazon-ec2-hibinit-agent/pull/49 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2322884 --- ...-maximum-priority-before-hibernation.patch | 54 +++++++++++++++++++ ec2-hibinit-agent.spec | 12 ++++- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 0001-swapon-with-maximum-priority-before-hibernation.patch diff --git a/0001-swapon-with-maximum-priority-before-hibernation.patch b/0001-swapon-with-maximum-priority-before-hibernation.patch new file mode 100644 index 0000000..cba7e2f --- /dev/null +++ b/0001-swapon-with-maximum-priority-before-hibernation.patch @@ -0,0 +1,54 @@ +From f75434659a731ebdfc259990eb37777700900ea2 Mon Sep 17 00:00:00 2001 +From: Dominik Wombacher +Date: Thu, 7 Nov 2024 15:27:03 +0000 +Subject: [PATCH 1/1] fix(rhel): Swapon with maximum priority before + hibernation + +Apply swapon high priority related changes from /acpid.sleep.sh to /packaging/rhel/acpid.sleep.sh + +Refs: https://github.com/aws/amazon-ec2-hibinit-agent/commit/a2303d269610a6e7415c5045766da605eaa7e30f +--- + packaging/rhel/acpid.sleep.sh | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/packaging/rhel/acpid.sleep.sh b/packaging/rhel/acpid.sleep.sh +index ca3db22..9b381f9 100755 +--- a/packaging/rhel/acpid.sleep.sh ++++ b/packaging/rhel/acpid.sleep.sh +@@ -3,11 +3,14 @@ + PATH=/sbin:/bin:/usr/bin + failed='false' + ++# Hibernation selects the swapfile with highest priority. Since there may be ++# other swapfiles configured, ensure /swap is selected as hibernation ++# target by setting to maximum priority. ++swap_priority=32767 ++ + hibernate() + { +- swapon /swap +- systemctl hibernate +- ++ swapon --priority=$swap_priority /swap && systemctl hibernate + if [ $? -ne 0 ] + then + logger "Hibernation failed, Sleeping 2 mins before retry" +@@ -15,6 +18,7 @@ hibernate() + else + failed='false' + fi ++ swapoff /swap + } + + case "$2" in +@@ -26,6 +30,7 @@ case "$2" in + hibernate + if [ $failed == 'true' ]; + then ++ swapoff /swap + sleep 2m + else + break +-- +2.47.0 + diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 026f627..876af8e 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,13 +12,17 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 URL: https://github.com/aws/amazon-%{name} Source0: https://github.com/aws/%{project}/archive/v%{version}/%{name}-%{version}.tar.gz +# Ensure swapon with maximum priority before hibernation +# Upstream Patch: https://github.com/aws/amazon-ec2-hibinit-agent/pull/49) +Patch1: 0001-swapon-with-maximum-priority-before-hibernation.patch + BuildArch: noarch BuildRequires: make @@ -38,7 +42,7 @@ Requires: tuned An EC2 agent that creates a setup for instance hibernation %prep -%autosetup -n %{project}-%{version} +%autosetup -p1 -n %{project}-%{version} # Fix build with setuptools 62.1 # https://github.com/aws/amazon-ec2-hibinit-agent/issues/24 sed -i "20i packages=[]," setup.py @@ -144,6 +148,10 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Fri Nov 08 2024 Dominik Wombacher - 1.0.9-4 +- Include upstream Patch to ensure swapon with maximum priority before hibernation +- Resolves rhbz#2322884 + * Wed Jul 17 2024 Fedora Release Engineering - 1.0.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8faa7d0264ce6952a00903dfc306885e80dfdeac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 16:35:05 +0000 Subject: [PATCH 12/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 876af8e..fd95562 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -148,6 +148,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.0.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 08 2024 Dominik Wombacher - 1.0.9-4 - Include upstream Patch to ensure swapon with maximum priority before hibernation - Resolves rhbz#2322884 From 8d3ba6125a5bda8200a5569cd5267a901d90b74e Mon Sep 17 00:00:00 2001 From: Frank Liang Date: Tue, 18 Mar 2025 09:37:33 +0800 Subject: [PATCH 13/18] fix swapoff breaks hibernate process Refs: https://github.com/aws/amazon-ec2-hibinit-agent/pull/50 Signed-off-by: Frank Liang (cherry picked from commit 2ebeb61bbb6573874a24df7568d2f4c70c6e376a) --- ...fix-swapoff-breaks-hibernate-process.patch | 59 +++++++++++++++++++ ec2-hibinit-agent.spec | 6 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 0002-rhel-fix-swapoff-breaks-hibernate-process.patch diff --git a/0002-rhel-fix-swapoff-breaks-hibernate-process.patch b/0002-rhel-fix-swapoff-breaks-hibernate-process.patch new file mode 100644 index 0000000..06c042e --- /dev/null +++ b/0002-rhel-fix-swapoff-breaks-hibernate-process.patch @@ -0,0 +1,59 @@ +From 0197c7173a5ad1470060862a0be96b9a976bdf49 Mon Sep 17 00:00:00 2001 +From: Frank Liang +Date: Thu, 2 Jan 2025 22:28:12 +0800 +Subject: [PATCH] rhel: fix swapoff breaks hibernate process + +hibernate() always calling swapoff breaks hibernation process. +The hibernation wont continue if call swapoff too fast in rhel or amazon +linux. + +"swapon --priority=32767 /swap && systemctl hibernate ;echo $?; swapoff /swap" + +Signed-off-by: Frank Liang +--- + packaging/rhel/acpid.sleep.sh | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +diff --git a/packaging/rhel/acpid.sleep.sh b/packaging/rhel/acpid.sleep.sh +index 9b381f9..1e55b51 100755 +--- a/packaging/rhel/acpid.sleep.sh ++++ b/packaging/rhel/acpid.sleep.sh +@@ -11,29 +11,24 @@ swap_priority=32767 + hibernate() + { + swapon --priority=$swap_priority /swap && systemctl hibernate +- if [ $? -ne 0 ] +- then ++ if [ $? -ne 0 ]; then + logger "Hibernation failed, Sleeping 2 mins before retry" + failed='true' ++ swapoff /swap ++ sleep 2m + else + failed='false' + fi +- swapoff /swap + } + + case "$2" in + SBTN) + # The iteration had been placed here to add retry logic to hibernation + # in case of failures and to avoid force stop of instances after 20min +- for i in 1 2 3 +- do ++ for i in 1 2 3; do + hibernate +- if [ $failed == 'true' ]; +- then +- swapoff /swap +- sleep 2m +- else +- break ++ if [ $failed == 'false' ]; then ++ break + fi + done + ;; +-- +2.48.1 + diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index fd95562..1d38962 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -22,6 +22,7 @@ Source0: https://github.com/aws/%{project}/archive/v%{version}/%{name}-%{ # Ensure swapon with maximum priority before hibernation # Upstream Patch: https://github.com/aws/amazon-ec2-hibinit-agent/pull/49) Patch1: 0001-swapon-with-maximum-priority-before-hibernation.patch +Patch2: 0002-rhel-fix-swapoff-breaks-hibernate-process.patch BuildArch: noarch @@ -148,6 +149,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Tue Mar 18 2025 Frank Liang - 1.0.9-6 +- Include upstream Patch to fix swapoff breaks hibernate process + * Thu Jan 16 2025 Fedora Release Engineering - 1.0.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b01e3c9b651437ade275ad10e81506c5f4c6e195 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 12:20:16 +0200 Subject: [PATCH 14/18] Rebuilt for Python 3.14 --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 1d38962..c26867c 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -149,6 +149,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Tue Jun 03 2025 Python Maint - 1.0.9-7 +- Rebuilt for Python 3.14 + * Tue Mar 18 2025 Frank Liang - 1.0.9-6 - Include upstream Patch to fix swapoff breaks hibernate process From 907cf67e48e5e8841e253f02bd71556fd8680e75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:41:21 +0000 Subject: [PATCH 15/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index c26867c..9defa5e 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -149,6 +149,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.0.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 1.0.9-7 - Rebuilt for Python 3.14 From 0c339f8028da2e49b85c2ab3327f91dbead74230 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 10:24:44 +0000 Subject: [PATCH 16/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index 9defa5e..a092799 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -149,6 +149,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.0.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.0.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 8ce7c2eb08caaab1020bc3a7bd36fc65f30e405a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 5 Jun 2026 00:03:53 +0200 Subject: [PATCH 17/18] Rebuilt for Python 3.15 --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index a092799..b8ab8b2 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -149,6 +149,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Thu Jun 04 2026 Python Maint - 1.0.9-10 +- Rebuilt for Python 3.15 + * Fri Jan 16 2026 Fedora Release Engineering - 1.0.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From cc780d207a5d498d28fd2b12e37623ff50d1743f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 15 Jul 2026 22:12:13 +0000 Subject: [PATCH 18/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- ec2-hibinit-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec index b8ab8b2..7a8c334 100644 --- a/ec2-hibinit-agent.spec +++ b/ec2-hibinit-agent.spec @@ -12,7 +12,7 @@ Name: ec2-hibinit-agent Version: 1.0.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Hibernation setup utility for Amazon EC2 License: Apache-2.0 @@ -149,6 +149,9 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog +* Wed Jul 15 2026 Fedora Release Engineering - 1.0.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 1.0.9-10 - Rebuilt for Python 3.15