From: Christoph Heiss <c.heiss@proxmox.com>
To: Aaron Lauterer <a.lauterer@proxmox.com>
Cc: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v1 installer 14/18] auto-installer: add fetch answer binary
Date: Thu, 8 Feb 2024 15:18:31 +0100 [thread overview]
Message-ID: <hlxjwyg7qxkzhyufxjq5zpylw2bcftnn7yoy7ov2jlmpjfp4ag@64bgsvtlp7dz> (raw)
In-Reply-To: <20240123170053.490250-15-a.lauterer@proxmox.com>
Sorry for not including this in the first email.
On Tue, Jan 23, 2024 at 06:00:49PM +0100, Aaron Lauterer wrote:
[..]
> diff --git a/proxmox-auto-installer/src/fetch_plugins/partition.rs b/proxmox-auto-installer/src/fetch_plugins/partition.rs
> new file mode 100644
> index 0000000..0552ddd
> --- /dev/null
> +++ b/proxmox-auto-installer/src/fetch_plugins/partition.rs
> @@ -0,0 +1,102 @@
> +use anyhow::{bail, Result};
> +use log::{info, warn};
> +use std::fs::read_to_string;
> +use std::path::{Path, PathBuf};
> +use std::process::Command;
> +
> +static ANSWER_FILE: &str = "answer.toml";
> +static ANSWER_MP: &str = "/mnt/answer";
> +static PARTLABEL: &str = "proxmoxinst";
> +static SEARCH_PATH: &str = "/dev/disk/by-label";
> +
> +pub struct FetchFromPartition;
> +
> +impl FetchFromPartition {
> + /// Returns the contents of the answer file
> + pub fn get_answer() -> Result<String> {
> + let part_path = Self::scan_partlabels()?;
> + Self::mount_part(part_path)?;
> + Self::get_answer_file()
Before returning, the partition should be unmounted, as it is not needed
anymore after this point.
This also prevents some funny error that occurs if the installation
fails due to some error. The next time `proxmox-fetch-answer` is run, it
cannot mount the answer partition anymore, due to being already mounted.
> +
[..]
> +
> + /// Will mount source path to ANSWER_MP
> + ///
> + /// # Arguments
> + ///
> + /// * `source` - `PathBuf` of the source location
> + fn mount_part(source: PathBuf) -> Result<()> {
> + info!("Mounting partition at {ANSWER_MP}");
> + // create dir for mountpoint
> + match Command::new("/usr/bin/mkdir")
> + .arg(ANSWER_MP)
> + .arg("-p")
> + .output()
> + {
> + Ok(output) => {
> + if !output.status.success() {
> + warn!(
> + "Error creating mount path: {}",
> + String::from_utf8(output.stderr)?
> + )
> + }
> + }
> + Err(err) => bail!("Error creating mount path: {}", err),
> + }
> + match Command::new("/usr/bin/mount")
> + .arg(source)
> + .arg(ANSWER_MP)
I'd argue the partition should be mounted with `-o ro` and thus
readonly, just for the sake of it. We never write to it anyway and this
would prevent any (accidental) attempt to do so in the future.
> + .output()
> + {
> + Ok(output) => {
> + if output.status.success() {
> + Ok(())
> + } else {
> + warn!("Error mounting: {}", String::from_utf8(output.stderr)?);
> + Ok(())
> + }
> + }
> + Err(err) => bail!("Error mounting: {}", err),
> + }
> + }
> +
[..]
next prev parent reply other threads:[~2024-02-08 14:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-23 17:00 [pve-devel] [PATCH v1 installer/docs 00/18] add automated/unattended installation Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 01/18] tui: common: move InstallConfig struct to common crate Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 02/18] common: make InstallZfsOption members public Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 03/18] common: tui: use BTreeMap for predictable ordering Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 04/18] Makefile: fix handling of multiple usr_bin files Aaron Lauterer
2024-02-06 14:28 ` [pve-devel] applied: " Thomas Lamprecht
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 05/18] low-level: add dump-udev command Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 06/18] add auto-installer crate Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 07/18] auto-installer: add dependencies Aaron Lauterer
2024-01-31 13:52 ` Christoph Heiss
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 08/18] auto-installer: add answer file definition Aaron Lauterer
2024-01-31 13:50 ` Christoph Heiss
2024-02-23 14:27 ` Stefan Lendl
2024-02-27 13:45 ` Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 09/18] auto-installer: add struct to hold udev info Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 10/18] auto-installer: add utils Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 11/18] auto-installer: add simple logging Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 12/18] auto-installer: add tests for answer file parsing Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 13/18] auto-installer: add auto-installer binary Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 14/18] auto-installer: add fetch answer binary Aaron Lauterer
2024-02-06 11:33 ` Christoph Heiss
2024-02-08 14:18 ` Christoph Heiss [this message]
2024-02-08 16:46 ` Aaron Lauterer
2024-02-16 16:34 ` Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 15/18] auto-installer: use glob crate for pattern matching Aaron Lauterer
2024-02-08 9:01 ` Christoph Heiss
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 16/18] auto-installer: utils: make get_udev_index functions public Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 installer 17/18] auto-installer: add proxmox-installer-filter helper tool Aaron Lauterer
2024-01-23 17:00 ` [pve-devel] [PATCH v1 docs 18/18] installation: add unattended documentation Aaron Lauterer
2024-02-08 10:26 ` [pve-devel] [PATCH v1 installer/docs 00/18] add automated/unattended installation Christoph Heiss
2024-02-08 10:34 ` Christoph Heiss
2024-02-08 11:32 ` Aaron Lauterer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=hlxjwyg7qxkzhyufxjq5zpylw2bcftnn7yoy7ov2jlmpjfp4ag@64bgsvtlp7dz \
--to=c.heiss@proxmox.com \
--cc=a.lauterer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox