base: ostree: add support systemd-boot automatic boot assesment

Add support for Automatic Boot Assessment [1]. Boot entries are now created with an additional suffix, which represents the amount of maximum tries for boot counting. [1] https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/ Signed-off-by: Igor Opaniuk <[email protected]>
foundriesio · Sep 16, 2024 · 5ec9687 · 5ec9687
1 parent 3c4c0d3
commit 5ec9687
Show file tree

Hide file tree

Showing 2 changed files with 149 additions and 0 deletions.
diff --git a/...cipes-extended/ostree/ostree/0006-Add-support-systemd-boot-automatic-boot-assesment.patch b/...cipes-extended/ostree/ostree/0006-Add-support-systemd-boot-automatic-boot-assesment.patch
@@ -0,0 +1,148 @@
+From a9e35b76fd5e47b9bc29a7113d97a4d98a973e75 Mon Sep 17 00:00:00 2001
+From: Igor Opaniuk <[email protected]>
+Date: Wed, 11 Sep 2024 18:03:10 +0200
+Subject: [PATCH] Add support systemd-boot automatic boot assesment
+
+Add support for Automatic Boot Assessment [1].
+Boot entries are now created with an additional suffix, which
+represents the amount of maximum tries for boot counting.
+
+[1] https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/
+Upstream-Status: Inappropriate [lmp specific]
+Signed-off-by: Igor Opaniuk <[email protected]>
+---
+ src/libostree/ostree-sysroot-deploy.c | 66 +++++++++++++++++++++++----
+ 1 file changed, 58 insertions(+), 8 deletions(-)
+
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 99c894a..f9c496d 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -62,6 +62,8 @@
+   SD_ID128_MAKE (e8, 64, 6c, d6, 3d, ff, 46, 25, b7, 79, 09, a8, e7, a4, 09, 94)
+ #endif
+
++#define SYSTEMD_BOOT_MAX_RETRIES 3
++
+ /* How much additional space we require available on top of what we accounted
+  * during the early prune fallocate space check. This accounts for anything not
+  * captured directly by `get_kernel_layout_size()` like writing new BLS entries.
+@@ -1907,12 +1909,12 @@ parse_os_release (const char *contents, const char *split)
+   return ret;
+ }
+
+-/* Generate the filename we will use in /boot/loader/entries for this deployment.
++/* Generate the entry name we will use in /boot/loader/entries for this deployment.
+  * The provided n_deployments should be the total number of target deployments (which
+  * might be different from the cached value in the sysroot).
+  */
+ static char *
+-bootloader_entry_filename (OstreeSysroot *sysroot, guint n_deployments,
++bootloader_entry_name (OstreeSysroot *sysroot, guint n_deployments,
+                            OstreeDeployment *deployment)
+ {
+   guint index = n_deployments - ostree_deployment_get_index (deployment);
+@@ -1923,14 +1925,52 @@ bootloader_entry_filename (OstreeSysroot *sysroot, guint n_deployments,
+   if (use_old_naming)
+     {
+       const char *stateroot = ostree_deployment_get_osname (deployment);
+-      return g_strdup_printf ("ostree-%d-%s.conf", index, stateroot);
++      return g_strdup_printf ("ostree-%d-%s", index, stateroot);
+     }
+   else
+     {
+-      return g_strdup_printf ("ostree-%d.conf", index);
++      return g_strdup_printf ("ostree-%d", index);
+     }
+ }
+
++/* Drop all temporary entries in /boot/loader/entries for this deployment,
++ * which were created during automatic boot assesment
++ * https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/
++ */
++static gboolean
++bootloader_remove_tmp_entries (int dfd, const char *entry_name, GCancellable *cancellable,
++                               GError **error)
++{
++  g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
++  g_autofree char *entry_name_init = g_strdup_printf ("%s+%d", entry_name, SYSTEMD_BOOT_MAX_RETRIES);
++
++  if (!glnx_dirfd_iterator_init_at (dfd, ".", FALSE, &dfd_iter, error))
++    return FALSE;
++
++  while (TRUE)
++    {
++      struct dirent *dent = NULL;
++
++      if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&dfd_iter, &dent, cancellable, error))
++        return FALSE;
++      if (dent == NULL)
++        break;
++
++      /* Don't remove default boot entry (with +3 suffix) */
++      if (g_str_has_prefix (dent->d_name, entry_name_init))
++        continue;
++
++      if (g_str_has_prefix (dent->d_name, entry_name))
++        {
++          if (!glnx_shutil_rm_rf_at (dfd_iter.fd, dent->d_name, cancellable, error))
++            return FALSE;
++        }
++
++    }
++
++    return TRUE;
++}
++
+ /* Given @deployment, prepare it to be booted; basically copying its
+  * kernel/initramfs into /boot/ostree (if needed) and writing out an entry in
+  * /boot/loader/entries.
+@@ -1966,7 +2006,7 @@ install_deployment_kernel (OstreeSysroot *sysroot, int new_bootversion,
+   const char *bootcsum = ostree_deployment_get_bootcsum (deployment);
+   g_autofree char *bootcsumdir = g_strdup_printf ("ostree/%s-%s", osname, bootcsum);
+   g_autofree char *bootconfdir = g_strdup_printf ("loader.%d/entries", new_bootversion);
+-  g_autofree char *bootconf_name = bootloader_entry_filename (sysroot, n_deployments, deployment);
++  g_autofree char *bootconf_name = bootloader_entry_name (sysroot, n_deployments, deployment);
+
+   if (!glnx_shutil_mkdir_p_at (sysroot->boot_fd, bootcsumdir, 0775, cancellable, error))
+     return FALSE;
+@@ -2348,8 +2388,13 @@ install_deployment_kernel (OstreeSysroot *sysroot, int new_bootversion,
+   if (!glnx_opendirat (sysroot->boot_fd, bootconfdir, TRUE, &bootconf_dfd, error))
+     return FALSE;
+
++  g_autofree char *bootconf_filename = g_strdup_printf ("%s+%d.conf", bootconf_name, SYSTEMD_BOOT_MAX_RETRIES);
++
++  if (!bootloader_remove_tmp_entries(bootconf_dfd, bootconf_name, cancellable, error))
++    return FALSE;
++
+   if (!ostree_bootconfig_parser_write_at (ostree_deployment_get_bootconfig (deployment),
+-                                          bootconf_dfd, bootconf_name, cancellable, error))
++                                          bootconf_dfd, bootconf_filename, cancellable, error))
+     return FALSE;
+
+   return TRUE;
+@@ -4464,14 +4509,19 @@ ostree_sysroot_deployment_set_kargs_in_place (OstreeSysroot *self, OstreeDeploym
+       ostree_bootconfig_parser_set (new_bootconfig, "options", kargs_str);
+
+       g_autofree char *bootconf_name
+-          = bootloader_entry_filename (self, self->deployments->len, deployment);
++          = bootloader_entry_name (self, self->deployments->len, deployment);
+
+       g_autofree char *bootconfdir = g_strdup_printf ("loader.%d/entries", self->bootversion);
+       glnx_autofd int bootconf_dfd = -1;
+       if (!glnx_opendirat (self->boot_fd, bootconfdir, TRUE, &bootconf_dfd, error))
+         return FALSE;
+
+-      if (!ostree_bootconfig_parser_write_at (new_bootconfig, bootconf_dfd, bootconf_name,
++      g_autofree char *bootconf_filename = g_strdup_printf ("%s+%d.conf", bootconf_name, SYSTEMD_BOOT_MAX_RETRIES);
++
++      if (!bootloader_remove_tmp_entries(bootconf_dfd, bootconf_name, cancellable, error))
++        return FALSE;
++
++      if (!ostree_bootconfig_parser_write_at (new_bootconfig, bootconf_dfd, bootconf_filename,
+                                               cancellable, error))
+         return FALSE;
+     }
+-- 
+2.34.1
+
diff --git a/meta-lmp-base/recipes-extended/ostree/ostree_%.bbappend b/meta-lmp-base/recipes-extended/ostree/ostree_%.bbappend
@@ -10,6 +10,7 @@ SRC_URI:append = " \
     file://0003-Add-support-for-directories-instead-of-symbolic-link.patch \
     file://0004-Add-support-for-systemd-boot-bootloader.patch \
     file://0005-ostree-decrease-default-grub.cfg-timeout-and-set-def.patch \
+    file://0006-Add-support-systemd-boot-automatic-boot-assesment.patch \
 "
 
 PACKAGECONFIG:remove = "static"