diff -Nru cloud-init-24.1.3/debian/changelog cloud-init-24.1.3/debian/changelog --- cloud-init-24.1.3/debian/changelog 2024-04-06 00:18:48.000000000 +0100 +++ cloud-init-24.1.3/debian/changelog 2024-04-11 11:02:27.000000000 +0100 @@ -1,3 +1,9 @@ +cloud-init (24.1.3-0ubuntu4) noble; urgency=medium + + * Remove grub_dpkg module (LP: #2060695) + + -- Mate Kukri Thu, 11 Apr 2024 11:02:27 +0100 + cloud-init (24.1.3-0ubuntu3) noble; urgency=medium * cherry-pick 516fad6d: fix(url_helper): fix TCP connection leak on diff -Nru cloud-init-24.1.3/debian/patches/remove_grub_dpkg.patch cloud-init-24.1.3/debian/patches/remove_grub_dpkg.patch --- cloud-init-24.1.3/debian/patches/remove_grub_dpkg.patch 1970-01-01 01:00:00.000000000 +0100 +++ cloud-init-24.1.3/debian/patches/remove_grub_dpkg.patch 2024-04-11 11:02:19.000000000 +0100 @@ -0,0 +1,19 @@ +Description: Remove the grub_dpkg module from the config template + This module is no longer necessary, and sometimes results in overwriting + GRUB debconf set by curtin with incorrect values on first boot. +Author: Mate Kukri +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2060695 +Forwarded: no +Last-Update: 2024-04-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/config/cloud.cfg.tmpl ++++ b/config/cloud.cfg.tmpl +@@ -159,7 +159,6 @@ + {% if variant == "alpine" %} + - apk_configure + {% elif variant in ["debian", "ubuntu", "unknown"] %} +- - grub_dpkg + - apt_pipelining + - apt_configure + {% if variant == "ubuntu" %} diff -Nru cloud-init-24.1.3/debian/patches/series cloud-init-24.1.3/debian/patches/series --- cloud-init-24.1.3/debian/patches/series 2024-04-06 00:18:48.000000000 +0100 +++ cloud-init-24.1.3/debian/patches/series 2024-04-11 10:54:25.000000000 +0100 @@ -6,3 +6,4 @@ cpick-77771023-net-dhcp-raise-InvalidDHCPLeaseFileError-on-error cpick-f6ac6ee8-fix-dhcpcd-Make-lease-parsing-more-robust-5129 cpick-516fad6d-fix-url_helper-fix-TCP-connection-leak-on-readurl +remove_grub_dpkg.patch