Merge ~mfo/grub:lp1965983 into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

Proposed by Mauricio Faria de Oliveira
Status: Merged
Merge reported by: Julian Andres Klode
Merged at revision: 57c233fc6eb7bca647935f31a4ee25703af96ae0
Proposed branch: ~mfo/grub:lp1965983
Merge into: ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Diff against target: 35 lines (+11/-6)
1 file modified
debian/patches/ubuntu-zfs-enhance-support.patch (+11/-6)
Reviewer Review Type Date Requested Status
Julian Andres Klode Pending
Review via email: mp+429027@code.launchpad.net

Description of the change

Hi Julian,

This MR is just MR [1] modified to edit the original patch instead of adding a fixup patch
(per our IRC chat last Thursday).

[1] https://code.launchpad.net/~arbell/grub/+git/grub/+merge/417575

To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) wrote :

Rebased and merged

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/patches/ubuntu-zfs-enhance-support.patch b/debian/patches/ubuntu-zfs-enhance-support.patch
index f71d771..2d0a977 100644
--- a/debian/patches/ubuntu-zfs-enhance-support.patch
+++ b/debian/patches/ubuntu-zfs-enhance-support.patch
@@ -14,7 +14,8 @@ Subject: UBUNTU: Enhance ZFS grub support
1414
15Author: Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>15Author: Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
16Author: Didier Roche <didrocks@ubuntu.com>16Author: Didier Roche <didrocks@ubuntu.com>
17Last-Update: 2020-08-0617Author: Adam R Bell <a_0x07@protonmail.ch>
18Last-Update: 2022-08-27
18Patch-Name: ubuntu-zfs-enhance-support.patch19Patch-Name: ubuntu-zfs-enhance-support.patch
1920
20Signed-off-by: Didier Roche <didier.roche@canonical.com>21Signed-off-by: Didier Roche <didier.roche@canonical.com>
@@ -568,11 +569,15 @@ index 0000000..f321fe2
568+569+
569+ umount "${mntdir}" || true570+ umount "${mntdir}" || true
570+ # We needed to look in / for snapshots on root dataset, umount the snapshot for etc before zfs lazily unmount it571+ # We needed to look in / for snapshots on root dataset, umount the snapshot for etc before zfs lazily unmount it
571+ case "${etc_dir}" in /.zfs/snapshot/*/etc)572+ # This process only needs to run if the snapshot contains an .../etc path,
572+ snapshot_path="$(findmnt -n -o TARGET -T "${etc_dir}")"573+ # otherwise the build process may silently fail and produce no kernel lines in grub.cfg
573+ umount "${snapshot_path}" || true574+ if [ -e "${etc_dir}" ]; then
574+ ;;575+ case "${etc_dir}" in /.zfs/snapshot/*/etc)
575+ esac576+ snapshot_path="$(findmnt -n -o TARGET -T "${etc_dir}")"
577+ umount "${snapshot_path}" || true
578+ ;;
579+ esac
580+ fi
576+}581+}
577+582+
578+# Scan available boot options and returns in a formatted list583+# Scan available boot options and returns in a formatted list

Subscribers

People subscribed via source and target branches