Fix ostreedev#2664

HuijingHei · Jul 8, 2022 · e408b95 · e408b95
1 parent c93fb71
commit e408b95
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
@@ -23,6 +23,7 @@
 LIBOSTREE_2022.5 {
 global:
   ostree_kernel_args_append_if_missing;
+  ostree_sysroot_deployment_set_kargs_in_place;
 } LIBOSTREE_2022.4;
 
 /* Stub section for the stable release *after* this development one; don't

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
@@ -3620,6 +3620,40 @@ ostree_sysroot_deployment_set_kargs (OstreeSysroot     *self,
   return TRUE;
 }
 
+gboolean
+ostree_sysroot_deployment_set_kargs_in_place (OstreeSysroot     *self,
+                                     OstreeDeployment  *deployment,
+                                     char              *kargs_str,
+                                     GCancellable      *cancellable,
+                                     GError           **error)
+{
+  if (!_ostree_sysroot_ensure_writable (self, error))
+    return FALSE;
+
+  /* For now; instead of this do a redeployment */
+  g_assert (!ostree_deployment_is_staged (deployment));
+
+  OstreeBootconfigParser *new_bootconfig = ostree_deployment_get_bootconfig (deployment);
+  ostree_bootconfig_parser_set (new_bootconfig, "options", kargs_str);
+
+  g_autofree char *bootconf_name =
+    g_strdup_printf ("ostree-%d-%s.conf",
+                     self->deployments->len - ostree_deployment_get_index (deployment),
+                     ostree_deployment_get_osname (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 (ostree_deployment_get_bootconfig (deployment),
+                                          bootconf_dfd, bootconf_name,
+                                          cancellable, error))
+    return FALSE;
+
+  return TRUE;
+}
+
 /**
  * ostree_sysroot_deployment_set_mutable:
  * @self: Sysroot

diff --git a/src/libostree/ostree-sysroot.h b/src/libostree/ostree-sysroot.h
@@ -175,6 +175,13 @@ gboolean ostree_sysroot_deployment_set_kargs (OstreeSysroot     *self,
                                               GCancellable      *cancellable,
                                               GError           **error);
 
+_OSTREE_PUBLIC
+gboolean ostree_sysroot_deployment_set_kargs_in_place (OstreeSysroot     *self,
+                                              OstreeDeployment  *deployment,
+                                              char              *kargs_str,
+                                              GCancellable      *cancellable,
+                                              GError           **error);
+
 _OSTREE_PUBLIC
 gboolean ostree_sysroot_write_deployments (OstreeSysroot     *self,
                                            GPtrArray         *new_deployments,

diff --git a/src/ostree/ot-admin-kargs-builtin-edit-in-place.c b/src/ostree/ot-admin-kargs-builtin-edit-in-place.c
@@ -67,10 +67,10 @@ ot_admin_kargs_builtin_edit_in_place (int argc, char **argv, OstreeCommandInvoca
             }
         }
 
-      g_auto(GStrv) kargs_strv = ostree_kernel_args_to_strv (kargs);
+      g_autofree char *new_options = ostree_kernel_args_to_string (kargs);
 
-      if (!ostree_sysroot_deployment_set_kargs (sysroot, deployment,
-                                              kargs_strv,
+      if (!ostree_sysroot_deployment_set_kargs_in_place (sysroot, deployment,
+                                              new_options,
                                               cancellable, error))
         return FALSE;