install: support configuring sysroot.bls-append-except-default

crates/lib/src/install.rs

@@ -802,6 +802,18 @@ async fn initialize_ostree_root(state: &State, root_setup: &RootSetup) -> Result
             .run_capture_stderr()?;
     }
 
+    // Apply ostree configuration from install config
+    if let Some(install_config) = state.install_config.as_ref() {
+        if let Some(ostree_config) = install_config.ostree.as_ref() {
+            if let Some(bls_append_except_default) = ostree_config.bls_append_except_default.as_ref() {
+                Command::new("ostree")
+                    .args(["config", "--repo", "ostree/repo", "set", "sysroot.bls-append-except-default", bls_append_except_default])
+                    .cwd_dir(rootfs_dir.try_clone()?)
+                    .run_capture_stderr()?;
+            }
+        }
+    }
+
     let sysroot = {
         let path = format!(
             "/proc/{}/fd/{}",

crates/lib/src/install/config.rs

@@ -58,6 +58,15 @@ pub(crate) struct BasicFilesystems {
     // pub(crate) esp: Option<FilesystemCustomization>,
 }
 
+/// Configuration for ostree repository
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
+pub(crate) struct Ostree {
+    /// Boot Loader Spec entries that should append arguments only for non-default entries
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) bls_append_except_default: Option<String>,
+}
+
 /// The serialized [install] section
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(rename = "install", rename_all = "kebab-case", deny_unknown_fields)]
@@ -73,6 +82,8 @@ pub(crate) struct InstallConfiguration {
     pub(crate) kargs: Option<Vec<String>>,
     /// Supported architectures for this configuration
     pub(crate) match_architectures: Option<Vec<String>>,
+    /// Ostree repository configuration
+    pub(crate) ostree: Option<Ostree>,
 }
 
 fn merge_basic<T>(s: &mut Option<T>, o: Option<T>, _env: &EnvProperties) {
@@ -119,6 +130,13 @@ impl Mergeable for BasicFilesystems {
     }
 }
 
+impl Mergeable for Ostree {
+    /// Apply any values in other, overriding any existing values in `self`.
+    fn merge(&mut self, other: Self, env: &EnvProperties) {
+        merge_basic(&mut self.bls_append_except_default, other.bls_append_except_default, env)
+    }
+}
+
 impl Mergeable for InstallConfiguration {
     /// Apply any values in other, overriding any existing values in `self`.
     fn merge(&mut self, other: Self, env: &EnvProperties) {
@@ -133,6 +151,7 @@ impl Mergeable for InstallConfiguration {
             #[cfg(feature = "install-to-disk")]
             merge_basic(&mut self.block, other.block, env);
             self.filesystem.merge(other.filesystem, env);
+            self.ostree.merge(other.ostree, env);
             if let Some(other_kargs) = other.kargs {
                 self.kargs
                     .get_or_insert_with(Default::default)
@@ -572,4 +591,44 @@ root-fs-type = "xfs"
             )
         );
     }
+
+    #[test]
+    fn test_parse_ostree() {
+        let env = EnvProperties {
+            sys_arch: "x86_64".to_string(),
+        };
+        let c: InstallConfigurationToplevel = toml::from_str(
+            r##"[install.ostree]
+bls-append-except-default = "console=ttyS0"
+"##,
+        )
+        .unwrap();
+        let install = c.install.unwrap();
+        assert_eq!(
+            install.ostree.as_ref().unwrap().bls_append_except_default.as_ref().unwrap(),
+            "console=ttyS0"
+        );
+
+        // Test merging ostree config
+        let c: InstallConfigurationToplevel = toml::from_str(
+            r##"[install.ostree]
+bls-append-except-default = "console=ttyS0"
+"##,
+        )
+        .unwrap();
+        let mut install = c.install.unwrap();
+        let other = InstallConfigurationToplevel {
+            install: Some(InstallConfiguration {
+                ostree: Some(Ostree {
+                    bls_append_except_default: Some("console=tty0".to_string()),
+                }),
+                ..Default::default()
+            }),
+        };
+        install.merge(other.install.unwrap(), &env);
+        assert_eq!(
+            install.ostree.as_ref().unwrap().bls_append_except_default.as_ref().unwrap(),
+            "console=tty0"
+        );
+    }
 }