[pve-devel] [PATCH proxmox-offline-mirror 1/2] helper: make mountpoint non-optional

[Fabian Grünbichler]

the default/fallback was a remnant from a no-longer-employed
"copy-helper-to-medium" deployment strategy.

Signed-off-by: Fabian Grünbichler <f.gruenbich...@proxmox.com>
---
technically breaking, but the default/fallback of /usr/bin was bogus
anyway..

 src/bin/proxmox-offline-mirror-helper.rs | 31 +++---------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/bin/proxmox-offline-mirror-helper.rs 
b/src/bin/proxmox-offline-mirror-helper.rs
index af090a5..4efb343 100644
--- a/src/bin/proxmox-offline-mirror-helper.rs
+++ b/src/bin/proxmox-offline-mirror-helper.rs
@@ -64,16 +64,7 @@ async fn setup(_param: Value) -> Result<(), Error> {
         bail!("Setup wizard can only run interactively.");
     }
 
-    let default_dir = std::env::current_exe().map_or_else(
-        |_| None,
-        |mut p| {
-            p.pop();
-            let p = p.to_str();
-            p.map(str::to_string)
-        },
-    );
-
-    let mountpoint = read_string_from_tty("Path to medium mountpoint", 
default_dir.as_deref())?;
+    let mountpoint = read_string_from_tty("Path to medium mountpoint", None)?;
     let mountpoint = Path::new(&mountpoint);
     if !mountpoint.exists() {
         bail!("Medium mountpoint doesn't exist.");
@@ -267,8 +258,7 @@ async fn setup(_param: Value) -> Result<(), Error> {
         properties: {
             mountpoint: {
                 type: String,
-                optional: true,
-                description: "Path to medium mountpoint - defaults to 
`proxmox-offline-mirror-helper` containing directory.",
+                description: "Path to medium mountpoint",
             },
             product: {
                 type: ProductType,
@@ -278,7 +268,7 @@ async fn setup(_param: Value) -> Result<(), Error> {
 )]
 /// Configures and offline subscription key
 async fn setup_offline_key(
-    mountpoint: Option<String>,
+    mountpoint: String,
     product: ProductType,
     _param: Value,
 ) -> Result<(), Error> {
@@ -289,21 +279,6 @@ async fn setup_offline_key(
         );
     }
 
-    let mountpoint = mountpoint
-        .or_else(|| {
-            std::env::current_exe().map_or_else(
-                |_| None,
-                |mut p| {
-                    p.pop();
-                    let p = p.to_str();
-                    p.map(str::to_string)
-                },
-            )
-        })
-        .ok_or_else(|| {
-            format_err!("Failed to determine fallback mountpoint via 
executable path.")
-        })?;
-
     let mountpoint = Path::new(&mountpoint);
     if !mountpoint.exists() {
         bail!("Medium mountpoint doesn't exist.");
-- 
2.30.2



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