Merge remote-tracking branch 'origin/master' into bootloader_force_us…

…er_input
agama-project · Dec 19, 2024 · 4398045 · 4398045
2 parents 5492568 + 1477848
commit 4398045
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/rust/agama-lib/share/profile.schema.json b/rust/agama-lib/share/profile.schema.json
@@ -106,8 +106,8 @@
                 "title": "The name of the network interface bound to this connection",
                 "type": "string"
               },
-              "mac-address": {
-                "title": "Custom mac-address",
+              "macAddress": {
+                "title": "Custom MAC address",
                 "description": "Can also be 'preserve', 'permanent', 'random' or 'stable'.",
                 "type": "string"
               },
@@ -159,10 +159,21 @@
                   "additionalProperties": false
                 }
               },
-              "ignore_auto_dns": {
+              "ignoreAutoDns": {
                 "description": "Whether DNS options provided via DHCP are used or not",
                 "type": "boolean"
               },
+              "status": {
+                "title": "Connection status",
+                "description": "The status of the connection",
+                "type": "string",
+                "enum": ["up", "down", "removed"]
+              },
+              "autoconnect": {
+                "title": "Auto-connected",
+                "description": "Whether the connection should be automatically connected",
+                "type": "boolean"
+              },
               "wireless": {
                 "type": "object",
                 "title": "Wireless configuration",
@@ -399,6 +410,11 @@
         "hashedPassword": {
           "title": "Flag for hashed password (true) or plain text password (false or not defined)",
           "type": "boolean"
+        },
+        "autologin": {
+          "title": "Automatic user login",
+          "description": "Whether the user should be automatically logged in (only relevant in desktop systems)",
+          "type": "boolean"
         }
       },
       "required": ["fullName", "userName", "password"]

diff --git a/rust/agama-lib/src/product/settings.rs b/rust/agama-lib/src/product/settings.rs
@@ -28,6 +28,8 @@ use serde::{Deserialize, Serialize};
 pub struct ProductSettings {
     /// ID of the product to install (e.g., "ALP", "Tumbleweed", etc.)
     pub id: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub registration_code: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub registration_email: Option<String>,
 }
diff --git a/rust/agama-lib/src/users/settings.rs b/rust/agama-lib/src/users/settings.rs
@@ -62,5 +62,6 @@ pub struct RootUserSettings {
     #[serde(skip_serializing)]
     pub hashed_password: Option<bool>,
     /// Root SSH public key
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub ssh_public_key: Option<String>,
 }
diff --git a/rust/package/agama.changes b/rust/package/agama.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 19 11:39:14 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>
+
+- Fix several validation issues (gh#agama-project/agama#1845).
+
 -------------------------------------------------------------------
 Wed Dec 18 12:32:00 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>