direktil/dkl
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: more defaults and ignore-if-empty

Browse Source
This commit is contained in:
Mikaël Cluseau
2025-11-16 17:21:41 +01:00
parent 3fe6fc9222
commit c4ed68d0e9
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bootstrap.rs
View File

@ -122,9 +122,10 @@ pub struct LvmLVDefaults {
pub raid: Raid, pub raid: Raid,
} }
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] #[derive(Clone, Default, Debug, serde::Deserialize, serde::Serialize)]
#[serde(rename_all = "snake_case")] #[serde(rename_all = "snake_case")]
pub enum Filesystem { pub enum Filesystem {
#[default]
Ext4, Ext4,
Xfs, Xfs,
Btrfs, Btrfs,
@ -143,12 +144,6 @@ impl Filesystem {
} }
} }
impl Default for Filesystem {
fn default() -> Self {
Filesystem::Ext4
}
}
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
pub struct LvmLV { pub struct LvmLV {
pub name: String, pub name: String,

12
src/lib.rs
View File

@ -1,11 +1,11 @@
pub mod apply; pub mod apply;
pub mod bootstrap; pub mod bootstrap;
pub mod dls; pub mod dls;
pub mod logger;
pub mod dynlay; pub mod dynlay;
pub mod fs; pub mod fs;
pub mod logger;
#[derive(Debug, serde::Deserialize, serde::Serialize)] #[derive(Debug, Default, serde::Deserialize, serde::Serialize)]
pub struct Config { pub struct Config {
pub layers: Vec<String>, pub layers: Vec<String>,
pub root_user: RootUser, pub root_user: RootUser,
@ -19,18 +19,20 @@ pub struct Config {
pub users: Vec<User>, pub users: Vec<User>,
} }
#[derive(Debug, serde::Deserialize, serde::Serialize)] #[derive(Debug, Default, serde::Deserialize, serde::Serialize)]
pub struct RootUser { pub struct RootUser {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub password_hash: Option<String>, pub password_hash: Option<String>,
pub authorized_keys: Vec<String>, pub authorized_keys: Vec<String>,
} }
#[derive(Debug, serde::Deserialize, serde::Serialize)] #[derive(Debug, Default, serde::Deserialize, serde::Serialize)]
pub struct Mount { pub struct Mount {
pub r#type: Option<String>,
pub dev: String, pub dev: String,
pub path: String, pub path: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub r#type: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub options: Option<String>, pub options: Option<String>,
} }