From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 255BF1FF16E
for <inbox@lore.proxmox.com>; Mon, 31 Mar 2025 14:20:45 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 402BF297F;
Mon, 31 Mar 2025 14:20:34 +0200 (CEST)
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 31 Mar 2025 14:20:05 +0200
Message-ID: <20250331122018.740427-3-c.heiss@proxmox.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250331122018.740427-1-c.heiss@proxmox.com>
References: <20250331122018.740427-1-c.heiss@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.031 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH installer 2/2] post-hook: add `reboot_mode` field
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.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