Merge ~mitchdz/ubuntu/+source/ec2-hibinit-agent:mitch/arm-focal into ubuntu/+source/ec2-hibinit-agent:ubuntu/focal-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/ec2-hibinit-agent-arm

[Mitchell Dzurick (mitchdz)]

Due to this MP being the same for multiple release, check the testing results in the bug report at https://bugs.launchpad.net/bugs/2066999

[Lena Voytek (lvoytek)]

LGTM

dput ubuntu ../ec2-hibinit-agent_1.0.0-0ubuntu9.6_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../ec2-hibinit-agent_1.0.0-0ubuntu9.6_source.changes: Valid signature from 34B8AD7D9529E793
Checking signature on .dsc
gpg: ../ec2-hibinit-agent_1.0.0-0ubuntu9.6.dsc: Valid signature from 34B8AD7D9529E793
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ec2-hibinit-agent_1.0.0-0ubuntu9.6.dsc: done.
  Uploading ec2-hibinit-agent_1.0.0-0ubuntu9.6.debian.tar.xz: done.
  Uploading ec2-hibinit-agent_1.0.0-0ubuntu9.6_source.buildinfo: done.
  Uploading ec2-hibinit-agent_1.0.0-0ubuntu9.6_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index a8c5080..70c86b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ec2-hibinit-agent (1.0.0-0ubuntu9.6) focal; urgency=medium
+
+  * d/p/0015-ignore-setting-resume-offset-again-if-dev-snapshot-d.patch: do
+    not set the snapshot swap area if /dev/snapshot does not exist. This is
+    necessary to enable ARM hibernation. (LP: #2066999)
+
+ -- Mitchell Dzurick <[e-mail]>  Thu, 23 May 2024 16:39:47 -0700
+
 ec2-hibinit-agent (1.0.0-0ubuntu9.5) focal; urgency=medium
 
   * d/p/lp2031345-recreate-swap-file.patch: Reduce SWAP size if current SWAP
diff --git a/debian/patches/0015-ignore-setting-resume-offset-again-if-dev-snapshot-d.patch b/debian/patches/0015-ignore-setting-resume-offset-again-if-dev-snapshot-d.patch
new file mode 100644
index 0000000..65ddd69
--- /dev/null
+++ b/debian/patches/0015-ignore-setting-resume-offset-again-if-dev-snapshot-d.patch
@@ -0,0 +1,40 @@
+Description: Do not set snapshot swap area if it does not exist
+Author: Carolan <[e-mail]>
+Origin: upstream, https://github.com/aws/amazon-ec2-hibinit-agent/commit/ab70d14fce4d9f05d54b363a0d849c5169e01ffa
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2066999
+Forwarded: not-needed
+Last-Update: 2024-05-23
+---
+ agent/hibinit-agent | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/agent/hibinit-agent b/agent/hibinit-agent
+index 2cc97ce..e36150e 100755
+--- a/agent/hibinit-agent
++++ b/agent/hibinit-agent
+@@ -130,15 +130,15 @@ def update_kernel_swap_offset(swapon, swapoff, filename, grub_update):
+     else:
+         log("Skipping GRUB configuration update")
+ 
+-    log("Setting swap device to %d with offset %d" % (dev, offset))
+-
+-    # Set the kernel swap offset, see https://www.kernel.org/doc/Documentation/power/userland-swsusp.txt
+-    # From linux/suspend_ioctls.h
+-    SNAPSHOT_SET_SWAP_AREA = 0x400C330D
+-    buf = struct.pack('LI', offset, dev)
+-    with open('/dev/snapshot', 'r') as snap:
+-        fcntl.ioctl(snap, SNAPSHOT_SET_SWAP_AREA, buf)
+-    log("Done updating the swap offset. Turning swapoff")
++    if os.path.exists("/dev/snapshot"):
++        log("Setting swap device to %d with offset %d" % (dev, offset))
++        # Set the kernel swap offset, see https://www.kernel.org/doc/Documentation/power/userland-swsusp.txt
++        # From linux/suspend_ioctls.h
++        SNAPSHOT_SET_SWAP_AREA = 0x400C330D
++        buf = struct.pack('LI', offset, dev)
++        with open('/dev/snapshot', 'r') as snap:
++            fcntl.ioctl(snap, SNAPSHOT_SET_SWAP_AREA, buf)
++        log("Done updating the swap offset. Turning swapoff")
+     swapoff = swapoff.format(swapfile=filename)
+     log("Running: %s" % swapoff)
+     check_call(swapoff, shell=True)
diff --git a/debian/patches/series b/debian/patches/series
index f66ab04..8e12c8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ lp1941785-Add-support-for-IMDSv2.patch
 lp2023924-remove-quotes-from-state-dir.patch
 lp2024505-fix-locale-issue.patch
 lp2031345-recreate-swap-file.patch
+0015-ignore-setting-resume-offset-again-if-dev-snapshot-d.patch