From d978f79fb18518b0b11087d815ff3ad294042bdd Mon Sep 17 00:00:00 2001
From: Nils Nieuwejaar <nils@oxidecomputer.com>
Date: Thu, 25 Jul 2024 20:37:24 +0000
Subject: [PATCH] fix svccfg

---
 nexus/src/app/background/tasks/sync_switch_configuration.rs | 2 +-
 sled-agent/src/services.rs                                  | 4 ++--
 sled-agent/src/smf_helper.rs                                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nexus/src/app/background/tasks/sync_switch_configuration.rs b/nexus/src/app/background/tasks/sync_switch_configuration.rs
index d114f99628f..0be258b0950 100644
--- a/nexus/src/app/background/tasks/sync_switch_configuration.rs
+++ b/nexus/src/app/background/tasks/sync_switch_configuration.rs
@@ -1006,7 +1006,7 @@ impl BackgroundTask for SwitchPortSettingsManager {
 				chassis_id: c.chassis_id.clone(),
 				system_name: c.system_name.clone(),
 				system_description: c.system_description.clone(),
-				management_addrs:c.management_ip.map(|a| vec![a.ip().into()]),
+				management_addrs:c.management_ip.map(|a| vec![a.ip()]),
 			    })
 		    }
                     ;
diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
index 149588edcb1..2fa7d0fa55c 100644
--- a/sled-agent/src/services.rs
+++ b/sled-agent/src/services.rs
@@ -3763,7 +3763,7 @@ impl ServiceManager {
         // We want to delete all the properties in the `uplinks` group, but we
         // don't know their names, so instead we'll delete and recreate the
         // group, then add all our properties.
-        usmfh.delpropgroup("uplinks")?;
+        let _ = usmfh.delpropgroup("uplinks");
         usmfh.addpropgroup("uplinks", "application")?;
 
         for port_config in &our_ports {
@@ -3778,7 +3778,7 @@ impl ServiceManager {
             if let Some(lldp_config) = &port_config.lldp {
                 let group_name = format!("port_{}", port_config.port);
                 info!(self.inner.log, "setting up {group_name}");
-                usmfh.delpropgroup(&group_name)?;
+                let _ = lsmfh.delpropgroup(&group_name);
                 lsmfh.addpropgroup(&group_name, "application")?;
                 apv(
                     &lsmfh,
diff --git a/sled-agent/src/smf_helper.rs b/sled-agent/src/smf_helper.rs
index 837aa591578..14b70c367a9 100644
--- a/sled-agent/src/smf_helper.rs
+++ b/sled-agent/src/smf_helper.rs
@@ -102,7 +102,7 @@ impl<'t> SmfHelper<'t> {
                 "addpropvalue",
                 &prop.to_string(),
                 &format!("{}:", valtype.to_string()),
-                &val.to_string(),
+                &format!("\"{}\"", val.to_string()),
             ])
             .map_err(|err| Error::ZoneCommand {
                 intent: format!("add {} smf property value", prop.to_string()),