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 [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9E2421FF165 for <inbox@lore.proxmox.com>; Thu, 27 Mar 2025 16:18:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8CD4C18671; Thu, 27 Mar 2025 16:17:59 +0100 (CET) From: Christoph Heiss <c.heiss@proxmox.com> To: pve-devel@lists.proxmox.com Date: Thu, 27 Mar 2025 16:17:11 +0100 Message-ID: <20250327151718.1084841-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [parse-answer.rs, options.rs, main.rs, utils.rs, answer.rs, proxmox.com] Subject: [pve-devel] [PATCH installer 0/6] fix #5811: add option to retrieve FQDN from DHCP configuration 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> Fixes #5811 [0]. Adds a new option to the answer file for specifying to use the DHCP-provided hostname and domain. For the domain, an additional fallback/default can be specified, in case the DHCP server only provides hostnames. The hostname is always required in this mode. The addition to the answer file format is done in a backwards-compatible way. Users can now specify the following to use the DHCP-provided domain: ``` [global] fqdn.source = "from-dhcp" ``` or additionally with a custom domain: ``` [global.fqdn] source = "from-dhcp" domain = "custom.domain.local" ``` Patches #1 through #4 can all be applied independently, #1 & #4 are pure cleanups. [0] https://bugzilla.proxmox.com/show_bug.cgi?id=5811 Diffstat ======== Christoph Heiss (6): auto: utils: avoid a force unwrap() auto: tests: parse-answer: allow per-test runtime env auto: tests: allow testing for serde parse errors of answer files tui, common: move network option tests to correct crate common: options: allow user-supplied domain for network options fix #5811: auto: add option to retrieve FQDN from DHCP configuration proxmox-auto-installer/src/answer.rs | 36 +++- proxmox-auto-installer/src/utils.rs | 43 ++++- proxmox-auto-installer/tests/parse-answer.rs | 43 +++-- .../parse_answer/fqdn_from_dhcp.json | 19 ++ .../parse_answer/fqdn_from_dhcp.toml | 14 ++ ...cp_no_dhcp_domain_with_default_domain.json | 19 ++ ...cp_no_dhcp_domain_with_default_domain.toml | 17 ++ ...ll_fqdn_from_dhcp_with_default_domain.json | 19 ++ ...ll_fqdn_from_dhcp_with_default_domain.toml | 17 ++ .../fqdn_from_dhcp_no_default_domain.json | 3 + ...n_from_dhcp_no_default_domain.run-env.json | 1 + .../fqdn_from_dhcp_no_default_domain.toml | 14 ++ .../parse_answer_fail/fqdn_hostname_only.json | 3 + .../parse_answer_fail/fqdn_hostname_only.toml | 14 ++ .../parse_answer_fail/no_fqdn_from_dhcp.json | 3 + .../no_fqdn_from_dhcp.run-env.json | 1 + .../parse_answer_fail/no_fqdn_from_dhcp.toml | 14 ++ .../tests/resources/run-env-info.json | 2 +- proxmox-installer-common/Cargo.toml | 3 + proxmox-installer-common/src/options.rs | 165 +++++++++++++++++- proxmox-post-hook/src/main.rs | 19 +- proxmox-tui-installer/Cargo.toml | 3 - proxmox-tui-installer/src/main.rs | 2 +- proxmox-tui-installer/src/options.rs | 93 ---------- 24 files changed, 440 insertions(+), 127 deletions(-) create mode 100644 proxmox-auto-installer/tests/resources/parse_answer/fqdn_from_dhcp.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer/fqdn_from_dhcp.toml create mode 100644 proxmox-auto-installer/tests/resources/parse_answer/fqdn_from_dhcp_no_dhcp_domain_with_default_domain.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer/fqdn_from_dhcp_no_dhcp_domain_with_default_domain.toml create mode 100644 proxmox-auto-installer/tests/resources/parse_answer/full_fqdn_from_dhcp_with_default_domain.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer/full_fqdn_from_dhcp_with_default_domain.toml create mode 100644 proxmox-auto-installer/tests/resources/parse_answer_fail/fqdn_from_dhcp_no_default_domain.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer_fail/fqdn_from_dhcp_no_default_domain.run-env.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer_fail/fqdn_from_dhcp_no_default_domain.toml create mode 100644 proxmox-auto-installer/tests/resources/parse_answer_fail/fqdn_hostname_only.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer_fail/fqdn_hostname_only.toml create mode 100644 proxmox-auto-installer/tests/resources/parse_answer_fail/no_fqdn_from_dhcp.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer_fail/no_fqdn_from_dhcp.run-env.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer_fail/no_fqdn_from_dhcp.toml -- 2.48.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel