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

Proposed by Alberto Contreras
Status: Needs review
Proposed branch: ~aciba/ubuntu/+source/hibagent:lp1896638-path-to-swapfile-by-uuid-jammy
Merge into: ubuntu/+source/hibagent:ubuntu/jammy-devel
Diff against target: 149 lines (+121/-0)
4 files modified
debian/changelog (+11/-0)
debian/patches/lp1896638-set-resume-device-by-partition-uuid.patch (+33/-0)
debian/patches/lp2013336-do-not-modify-GRUB-config-on-GRUB2-systems.patch (+75/-0)
debian/patches/series (+2/-0)
Reviewer Review Type Date Requested Status
Simon Chopin (community) Approve
Review via email: mp+440121@code.staging.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Simon Chopin (schopin) wrote :

UPloaded, with a slight adjustment to the version number.

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches