Merge ~aciba/ubuntu/+source/hibagent:lp1896638-path-to-swapfile-by-uuid-bionic into ubuntu/+source/hibagent:ubuntu/bionic-devel

[Alberto Contreras]

Cherry-picked upstream fixes 43636fcf and 0f995e80 in pkg/ubuntu/kinetic-devel:

  * d/p/lp1896638-set-resume-device-by-partition-uuid: Set resume device
    by PARTUUID instead of by name. Thanks to Tony Nie <email address hidden>.
    (LP: #1896638)

Please tag & sponsor.

PPA: ppa:aciba/hibagent-sru-lp1896638-swapfile

Steps to test:

* Launch an EC2 instance
# sudo /usr/bin/enable-ec2-spot-hibernation

* The resume partition is set by device name:
$ grep no_console /boot/grub/grub.cfg
... no_console_suspend=1 resume_offset=780288 resume=/dev/xvda1 ...

* Start a new EC2 instance. This is easier than manually reverting the state back (swap and config files).
# sudo apt-add-repository -ys ppa:aciba/hibagent-sru-lp1896638-swapfile
# sudo apt install -y hibagent
# sudo /usr/bin/enable-ec2-spot-hibernation

* Make sure the agent is active and running:
# systemctl status hibagent

* Make sure the swap is correctly configured:
$ swapon --show
NAME TYPE SIZE USED PRIO
/swap file 3.9G 512K -2

* Make sure the resume partition is defined by uuid:
$ grep no_console /boot/grub/grub.cfg
... no_console_suspend=1 resume_offset=780288 resume=PARTUUID=14aaf7d8-41e2-43b2-b149-a402305a5136 ...

bebafc5... by Alberto Contreras on 2023-04-04

changelog

[Simon Chopin (schopin)]

Uploaded, with a small adjustment to the version number.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 6a412fe..6c9c9a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hibagent (1.0.1-0ubuntu2.18.04.1) bionic; urgency=medium
+
+  * d/p/lp1896638-set-resume-device-by-partition-uuid: Set resume device
+    by PARTUUID instead of by name. Thanks to Tony Nie <[e-mail]>.
+    (LP: #1896638)
+
+ -- Alberto Contreras <[e-mail]>  Fri, 31 Mar 2023 10:02:42 +0200
+
 hibagent (1.0.1-0ubuntu1) bionic; urgency=medium
 
   * Build-depend on python3-all, it is needed by pybuild
diff --git a/debian/patches/lp1896638-set-resume-device-by-partition-uuid.patch b/debian/patches/lp1896638-set-resume-device-by-partition-uuid.patch
new file mode 100644
index 0000000..39ef202
--- /dev/null
+++ b/debian/patches/lp1896638-set-resume-device-by-partition-uuid.patch
@@ -0,0 +1,33 @@
+From: Tony Nie <[e-mail]>
+Subject: Set resume device by PARTUUID instead of by device name
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ec2-hibinit-agent/+bug/1896638
+Origin: upstream, https://github.com/aws/ec2-hibernate-linux-agent/commit/43636fcf
+---
+ agent/hibagent | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: b/agent/hibagent
+===================================================================
+--- a/agent/hibagent	2023-03-24 13:12:50.192981414 +0100
++++ b/agent/hibagent	2023-03-24 13:17:13.151025129 +0100
+@@ -99,6 +99,11 @@ def get_swap_space():
+         return int(lines[0].split()[2]) * 1024
+ 
+ 
++def get_partuuid(device):
++    return check_output(
++        ['lsblk', '-dno', 'PARTUUID', device]).decode('ascii').strip()
++
++
+ def patch_grub_config(swap_device, offset, grub_file, grub2_dir):
+     log("Updating GRUB to use the device %s with offset %d for resume" % (swap_device, offset))
+     lines = []
+@@ -128,6 +133,8 @@ def patch_grub_config(swap_device, offse
+     # Do GRUB2 update as well
+     if grub2_dir and os.path.exists(grub2_dir):
+         offset_file = os.path.join(grub2_dir, '99-set-swap.cfg')
++        if swap_device.startswith("/dev"):
++            swap_device = "PARTUUID=%s" % get_partuuid(swap_device)
+         if not os.path.exists(offset_file):
+             with open(offset_file, 'w') as fl:
+                 fl.write('GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT no_console_suspend=1 '
diff --git a/debian/patches/series b/debian/patches/series
index eddb8a8..6b13838 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ detect-hibernate-cmd-by-default.patch
 use-sh-for-init-scripts.patch
 add-lsb-init-info.patch
 fix-enable-ec2-spot-hibernation.patch
+lp1896638-set-resume-device-by-partition-uuid.patch