Merge ~jefferyto/ubuntu/+source/grub2:lp1475620 into ubuntu/+source/grub2:ubuntu/devel

[Jeffery To]

[Paride Legovini (paride)]

Hello,

If I understand it right this change already landed upstream (Debian) as part of this MR:

https://salsa.debian.org/grub-team/grub/-/merge_requests/33/commits

A package containing your fix is currently in experimental. My expectation is that the grub2 will be synced during the Mantic cycle (or merged leaving a minimal delta). This will bring your fix to Ubuntu. Therefore I am not sure a separate upload to Ubuntu is really worth it, also considering that the Importance of LP: #1475620 is Low. What do you think?

Speaking about your MP: you modified an already released d/changelog entry, while you should have added a new one (2.06-2ubuntu19). However, again, I am not convinced an upload is justified.

review: Needs Information

[Jeffery To (jefferyto)]

> Hello,
>
> If I understand it right this change already landed upstream (Debian) as part
> of this MR:
>
> https://salsa.debian.org/grub-team/grub/-/merge_requests/33/commits
>
> A package containing your fix is currently in experimental. My expectation is
> that the grub2 will be synced during the Mantic cycle (or merged leaving a
> minimal delta). This will bring your fix to Ubuntu. Therefore I am not sure a
> separate upload to Ubuntu is really worth it, also considering that the
> Importance of LP: #1475620 is Low. What do you think?
>
> Speaking about your MP: you modified an already released d/changelog entry,
> while you should have added a new one (2.06-2ubuntu19). However, again, I am
> not convinced an upload is justified.

Thanks for the review - I wasn't expecting my change to be merged in that MR, that was why I opened this proposal "upstream" (relative to that MR). I think this proposal can be closed/rejected.

Unmerged commits

35fa29f... by Jeffery To on 2023-06-12

grub-common.service: Fix service run before actual system sleep

The recordfail functionality is intended to detect if resuming after
hibernation failed:

* On boot, grub sets recordfail
* Kernel attempts to resume
* If resuming was successful, grub-common.service clears recordfail
* If resuming was unsuccessful, on next boot grub finds that recordfail
  is already set and adjusts the timeout value (to
  GRUB_RECORDFAIL_TIMEOUT or 30 seconds if GRUB_RECORDFAIL_TIMEOUT is
  not set)

However, grub-common.service is configured to run after sleep.target.
sleep.target is reached before actual system sleep occurs, and so
grub-common.service will very likely be run before the system shuts
down, i.e. before grub sets recordfail for the attempted resume.

This replaces sleep.target with hibernate.target, hybrid-sleep.target,
and suspend-then-hibernate.target; these targets are reached after the
system has resumed. (suspend.target is omitted as the system is not
fully shut down during suspend and so grub is not involved.)

Fixes LP: #1475620

c2d9ca0... by Julian Andres Klode on 2023-06-05

2.06-2ubuntu18 (patches unapplied)

Imported using git-ubuntu import.

3d8470c... by Julian Andres Klode on 2023-02-20

2.06-2ubuntu17 (patches unapplied)

Imported using git-ubuntu import.

4b727f7... by Julian Andres Klode on 2022-12-09

2.06-2ubuntu16 (patches unapplied)

Imported using git-ubuntu import.

12d118c... by Julian Andres Klode on 2022-12-01

2.06-2ubuntu15 (patches unapplied)

Imported using git-ubuntu import.

271b551... by Julian Andres Klode on 2022-09-19

2.06-2ubuntu12 (patches unapplied)

Imported using git-ubuntu import.

fa6ee71... by dann frazier on 2022-09-14

2.06-2ubuntu11 (patches unapplied)

Imported using git-ubuntu import.

4481c7e... by Chris Coulson on 2022-06-07

2.06-2ubuntu10 (patches unapplied)

Imported using git-ubuntu import.

4b653d7... by dann frazier on 2022-04-15

2.06-2ubuntu7 (patches unapplied)

Imported using git-ubuntu import.

059e913... by Julian Andres Klode on 2022-03-25

2.06-2ubuntu6 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 9e90c5a..52f094d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 grub2 (2.06-2ubuntu18) mantic; urgency=medium
 
+  [ Jeffery To ]
+  * grub-common.service: Fix service run before actual system sleep (LP:
+    #1475620)
+
   * Cherry-pick "RISC-V: Handle R_RISCV_CALL_PLT reloc" (LP: #2022379)
   * Drop i386 from grub-efi-amd64* (LP: #2020907)
   * Turn depends on grub-efi-amd64/arm64 unversioned
diff --git a/debian/grub-common.service b/debian/grub-common.service
index fcf5474..9172f1a 100644
--- a/debian/grub-common.service
+++ b/debian/grub-common.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Record successful boot for GRUB
-After=sleep.target
+After=hibernate.target hybrid-sleep.target suspend-then-hibernate.target
 ConditionPathExists=/boot/grub/grub.cfg
 
 [Service]
@@ -12,4 +12,4 @@ ExecStartPost=/bin/sh -c 'if grub-editenv /boot/grub/grubenv list | grep -q init
 StandardOutput=kmsg
 
 [Install]
-WantedBy=multi-user.target sleep.target
+WantedBy=multi-user.target hibernate.target hybrid-sleep.target suspend-then-hibernate.target