[pve-devel] [PATCH installer 2/2] post-hook: add `reboot_mode` field

[Christoph Heiss <c.heiss@proxmox.com>]

This just takes the option from the answer file and reproduces it for
the post-hook.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 proxmox-auto-installer/src/answer.rs | 2 +-
 proxmox-post-hook/src/main.rs        | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/proxmox-auto-installer/src/answer.rs b/proxmox-auto-installer/src/answer.rs
index c15016f..1c30178 100644
--- a/proxmox-auto-installer/src/answer.rs
+++ b/proxmox-auto-installer/src/answer.rs
@@ -62,7 +62,7 @@ pub struct Global {
     pub root_ssh_keys: Vec<String>,
 }
 
-#[derive(Clone, Deserialize, Debug, Default, PartialEq, Eq)]
+#[derive(Copy, Clone, Deserialize, Serialize, Debug, Default, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields)]
 pub enum RebootMode {
     #[default]
diff --git a/proxmox-post-hook/src/main.rs b/proxmox-post-hook/src/main.rs
index d03ce21..6a679b4 100644
--- a/proxmox-post-hook/src/main.rs
+++ b/proxmox-post-hook/src/main.rs
@@ -21,7 +21,7 @@ use std::{
 
 use anyhow::{Context, Result, anyhow, bail};
 use proxmox_auto_installer::{
-    answer::{Answer, PostNotificationHookInfo},
+    answer::{Answer, PostNotificationHookInfo, RebootMode},
     udevinfo::{UdevInfo, UdevProperties},
 };
 use proxmox_installer_common::{
@@ -144,7 +144,7 @@ struct PostHookInfoSchema {
 }
 
 impl PostHookInfoSchema {
-    const SCHEMA_VERSION: &str = "1.0";
+    const SCHEMA_VERSION: &str = "1.1";
 }
 
 impl Default for PostHookInfoSchema {
@@ -193,6 +193,8 @@ struct PostHookInfo {
     network_interfaces: Vec<NetworkInterfaceInfo>,
     /// Public parts of SSH host keys of the installed system
     ssh_public_host_keys: SshPublicHostKeys,
+    /// Action to will be performed, i.e. either reboot or power off the machine.
+    reboot_mode: RebootMode,
 }
 
 /// Defines the size of a gibibyte in bytes.
@@ -269,6 +271,7 @@ impl PostHookInfo {
                 ed25519: read_file("/etc/ssh/ssh_host_ed25519_key.pub")?,
                 rsa: read_file("/etc/ssh/ssh_host_rsa_key.pub")?,
             },
+            reboot_mode: answer.global.reboot_mode,
         })
     }
 
-- 
2.48.1



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel