Reserialize filesystem.toml instead of copying the original config

This will be necessary to handle including other configs from the config
to use as these configs will not be copied.
This commit is contained in:
bjorn3
2024-01-04 14:53:05 +01:00
parent c9e091be67
commit 5cdec46800
6 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -55,7 +55,7 @@ fn main() {
// Add filesystem.toml to config
config.files.push(redox_installer::FileConfig {
path: "filesystem.toml".to_string(),
data: config_data,
data: toml::to_string_pretty(&config).unwrap(),
..Default::default()
});
+1 -1
View File
@@ -29,7 +29,7 @@ fn chown<P: AsRef<Path>>(path: P, uid: uid_t, gid: gid_t, recursive: bool) -> Re
Ok(())
}
#[derive(Clone, Debug, Default, Deserialize)]
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct FileConfig {
pub path: String,
pub data: String,
+1 -1
View File
@@ -1,4 +1,4 @@
#[derive(Clone, Debug, Default, Deserialize)]
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct GeneralConfig {
pub prompt: bool,
// Allow config to specify cookbook recipe or binary package as default
+1 -1
View File
@@ -5,7 +5,7 @@ pub mod file;
pub mod package;
pub mod user;
#[derive(Clone, Debug, Default, Deserialize)]
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Config {
pub general: general::GeneralConfig,
#[serde(default)]
+1 -1
View File
@@ -1,4 +1,4 @@
#[derive(Clone, Debug, Deserialize)]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(untagged)]
pub enum PackageConfig {
Empty,
+1 -1
View File
@@ -1,4 +1,4 @@
#[derive(Clone, Debug, Default, Deserialize)]
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct UserConfig {
pub password: Option<String>,
pub uid: Option<u32>,