Merge ~aciba/ubuntu/+source/hibagent:lp1896638-path-to-swapfile-by-uuid-jammy into ubuntu/+source/hibagent:ubuntu/jammy-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)
  * d/p/lp2013336-do-not-modify-GRUB-config-on-GRUB2-systems: Do not attempt to
    modify non existent GRUB config file. Thanks to Robert Schweikert
    <email address hidden>. (LP: #2013336)

Please tag & sponsor.

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

Steps to test:

* Launch an EC2 instance
# sudo /usr/bin/enable-ec2-spot-hibernation
# journalctl -xeu hibagent.service | grep Errno
Failed to initialize swap, reason: [Errno 2] No such file or directory: '/boot/grub/menu.lst'

# 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 ...

7aa580c... by Alberto Contreras on 2023-04-04

changelog

[Simon Chopin (schopin)]

UPloaded, with a slight adjustment to the version number.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index ff27dd5..f7ab6b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+hibagent (1.0.1-0ubuntu3.22.04.1) jammy; 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)
+  * d/p/lp2013336-do-not-modify-GRUB-config-on-GRUB2-systems: Do not attempt to
+    modify non existent GRUB config file. Thanks to Robert Schweikert
+    <[e-mail]>. (LP: #2013336)
+
+ -- Alberto Contreras <[e-mail]>  Tue, 04 Apr 2023 18:22:05 +0200
+
 hibagent (1.0.1-0ubuntu2) hirsute; urgency=medium
 
   * debian/copyright: Set Source to public upstream GitHub repository
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/lp2013336-do-not-modify-GRUB-config-on-GRUB2-systems.patch b/debian/patches/lp2013336-do-not-modify-GRUB-config-on-GRUB2-systems.patch
new file mode 100644
index 0000000..737b401
--- /dev/null
+++ b/debian/patches/lp2013336-do-not-modify-GRUB-config-on-GRUB2-systems.patch
@@ -0,0 +1,75 @@
+From: Robert Schweikert <[e-mail]>
+Subject: Do not attempt to modify non existent GRUB config file
+
+Distributions either use GRUB or GRUB2, we need to guard against attempts
+to modify menu.lst on GRUB2 distributions
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/hibagent/+bug/2013336
+Origin: upstream, https://github.com/aws/ec2-hibernate-linux-agent/commit/0f995e80
+---
+ agent/hibagent | 48 +++++++++++++++++++++++++-----------------------
+ 1 file changed, 25 insertions(+), 23 deletions(-)
+
+diff --git a/agent/hibagent b/agent/hibagent
+index 02e2b03..f076220 100755
+--- a/agent/hibagent
++++ b/agent/hibagent
+@@ -100,30 +100,32 @@ def get_swap_space():
+ 
+ 
+ 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 = []
+-    with open(grub_file) as fl:
+-        for ln in fl.readlines():
+-            params = ln.split()
+-            if not params or params[0] != 'kernel':
+-                lines.append(ln)
+-                continue
+-
+-            new_params = []
+-            for param in params:
+-                if "resume_offset=" in param or "resume=" in param:
++    log("Updating GRUB to use the device %s with offset %d for resume"
++        % (swap_device, offset))
++    if grub_file and os.path.exists(grub_file):
++        lines = []
++        with open(grub_file) as fl:
++            for ln in fl.readlines():
++                params = ln.split()
++                if not params or params[0] != 'kernel':
++                    lines.append(ln)
+                     continue
+-                new_params.append(param)
+-
+-            if "no_console_suspend=" not in ln:
+-                new_params.append("no_console_suspend=1")
+-            new_params.append("resume_offset=%d" % offset)
+-            new_params.append("resume=%s" % swap_device)
+-
+-            lines.append(" ".join(new_params)+"\n")
+-
+-    with open(grub_file, "w") as fl:
+-        fl.write("".join(lines))
++    
++                new_params = []
++                for param in params:
++                    if "resume_offset=" in param or "resume=" in param:
++                        continue
++                    new_params.append(param)
++    
++                if "no_console_suspend=" not in ln:
++                    new_params.append("no_console_suspend=1")
++                new_params.append("resume_offset=%d" % offset)
++                new_params.append("resume=%s" % swap_device)
++    
++                lines.append(" ".join(new_params)+"\n")
++    
++        with open(grub_file, "w") as fl:
++            fl.write("".join(lines))
+ 
+     # Do GRUB2 update as well
+     if grub2_dir and os.path.exists(grub2_dir):
+-- 
+2.37.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 7dc0cd8..3174b35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ use-sh-for-init-scripts.patch
 add-lsb-init-info.patch
 fix-enable-ec2-spot-hibernation.patch
 0009-Use-Thread.is_alive-for-Python-3.9-compatibility.patch
+lp1896638-set-resume-device-by-partition-uuid.patch
+lp2013336-do-not-modify-GRUB-config-on-GRUB2-systems.patch