From c70006d03a70aa4b1279a7ef8998debedc2899dd Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Wed, 29 Jun 2022 09:11:14 -0400 Subject: [PATCH] upgrades: Re-add workaround for grub For dist-upgrade from buster to bullseye, we had a workaround to avoid grub error during upgrade. The workaround is still needed for dist-upgrade from bullseye to bookworm. Helps #2057. Test: 1. Build freedombox package for bullseye-backports with this fix included. 2. Install package in bullseye vagrant box. 3. Enable automatic updates, and start dist upgrade from action. 4. Check journal to see if there is an error from grub. Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- actions/upgrades | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/actions/upgrades b/actions/upgrades index 49069ce55..4d894782b 100755 --- a/actions/upgrades +++ b/actions/upgrades @@ -84,7 +84,10 @@ DIST_UPGRADE_PACKAGES_WITH_PROMPTS = [ DIST_UPGRADE_PRE_INSTALL_PACKAGES = ['base-files'] -DIST_UPGRADE_PRE_DEBCONF_SELECTIONS: List[str] = [] +DIST_UPGRADE_PRE_DEBCONF_SELECTIONS: List[str] = [ + # Tell grub-pc to continue without installing grub again. + 'grub-pc grub-pc/install_devices_empty boolean true' +] DIST_UPGRADE_REQUIRED_FREE_SPACE = 5000000