Conditionally run nvd only if the system hostname and target hostname…

…s match.
viperML · Jan 13, 2025 · 805fa5f · 805fa5f
1 parent a0261e2
commit 805fa5f
Showing 1 changed file with 24 additions and 15 deletions.
diff --git a/src/nixos.rs b/src/nixos.rs
@@ -71,13 +71,18 @@ impl OsRebuildArgs {
             update(&self.common.installable, self.update_args.update_input)?;
         }
 
-        let hostname = match &self.hostname {
+        let system_hostname = hostname::get()
+            .context("Failed to get hostname")?
+            .to_str()
+            .unwrap()
+            .to_owned();
+
+        let target_hostname = match &self.hostname {
             Some(h) => h.to_owned(),
-            None => hostname::get()
-                .context("Failed to get hostname")?
-                .to_str()
-                .unwrap()
-                .to_owned(),
+            None => {
+                tracing::warn!("Guessing system is {system_hostname} for a VM image. If this isn't intended, use --hostname to change.");
+                system_hostname.clone()
+            }
         };
 
         let out_path: Box<dyn crate::util::MaybeTempPath> = match self.common.out_link {
@@ -91,9 +96,9 @@ impl OsRebuildArgs {
         debug!(?out_path);
 
         let toplevel = toplevel_for(
-            hostname,
+            &target_hostname,
             self.common.installable.clone(),
-            final_attr.unwrap_or(String::from("toplevel"))
+            final_attr.unwrap_or(String::from("toplevel")),
         );
 
         let message = match variant {
@@ -126,14 +131,18 @@ impl OsRebuildArgs {
 
         target_profile.try_exists().context("Doesn't exist")?;
 
-        Command::new("nvd")
-            .arg("diff")
-            .arg(CURRENT_PROFILE)
-            .arg(&target_profile)
-            .message("Comparing changes")
-            .run()?;
+        if target_hostname == system_hostname {
+            Command::new("nvd")
+                .arg("diff")
+                .arg(CURRENT_PROFILE)
+                .arg(&target_profile)
+                .message("Comparing changes")
+                .run()?;
+        } else {
+            debug!("Not running nvd as the target hostname is different from the system hostname.")
+        }
 
-        if self.common.dry || matches!(variant, Build) {
+        if self.common.dry || matches!(variant, Build | BuildVm) {
             return Ok(());
         }