adapt PR after merge with main

karencfv · Mar 7, 2024 · 9df5f8c · 9df5f8c
1 parent 61795af
commit 9df5f8c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
@@ -2140,7 +2140,7 @@ impl ServiceManager {
                 let static_addr = underlay_address.to_string();
 
                 let nw_setup_service = Self::zone_network_setup_install(
-                    &info,
+                    &info.underlay_address,
                     &installed_zone,
                     &static_addr.clone(),
                 )?;

diff --git a/smf/nexus/manifest.xml b/smf/nexus/manifest.xml
@@ -14,7 +14,6 @@
   <dependency name='network' grouping='require_all' restart_on='none'
     type='service'>
   <service_fmri value='svc:/milestone/network:default' />
-
   </dependency>
 
   <dependency name='routing' grouping='require_all' restart_on='none'