From 16d03035bb58d4607788ad145d0a0703972cb56f Mon Sep 17 00:00:00 2001
From: karencfv <karencfv@users.noreply.github.com>
Date: Thu, 2 May 2024 18:59:15 +1200
Subject: [PATCH 1/2] [smf] Update manifests to reflect self assembling switch
 zone

---
 smf/ddm/manifest.xml | 10 +++++++++-
 smf/mgd/manifest.xml |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/smf/ddm/manifest.xml b/smf/ddm/manifest.xml
index 5e5da1cf..cf312c4e 100644
--- a/smf/ddm/manifest.xml
+++ b/smf/ddm/manifest.xml
@@ -4,12 +4,20 @@
 <service_bundle type='manifest' name='mg-ddm'>
 
 <service name='oxide/mg-ddm' type='service' version='1'>
-  <create_default_instance enabled='false' />
+  <create_default_instance enabled='true' />
   <dependency name='network' grouping='require_all' restart_on='none'
     type='service'>
   <service_fmri value='svc:/milestone/network:default' />
   </dependency>
 
+  <dependency name='zone_network_setup' grouping='require_all' restart_on='none' type='service'>
+    <service_fmri value='svc:/oxide/zone-network-setup:default' />
+  </dependency>
+
+  <dependency name='switch_zone_setup' grouping='require_all' restart_on='none' type='service'>
+    <service_fmri value='svc:/oxide/switch_zone_setup:default' />
+  </dependency>
+
   <exec_method type='method' name='start'
     exec='ctrun -l child -o noorphan,regent /opt/oxide/mg-ddm/pkg/ddm_method_script.sh &amp;'
     timeout_seconds='0' />
diff --git a/smf/mgd/manifest.xml b/smf/mgd/manifest.xml
index 3621ed92..72b22080 100644
--- a/smf/mgd/manifest.xml
+++ b/smf/mgd/manifest.xml
@@ -4,12 +4,16 @@
 <service_bundle type='manifest' name='mgd'>
 
 <service name='oxide/mgd' type='service' version='1'>
-  <create_default_instance enabled='false' />
+  <create_default_instance enabled='true' />
   <dependency name='network' grouping='require_all' restart_on='none'
     type='service'>
   <service_fmri value='svc:/milestone/network:default' />
   </dependency>
 
+  <dependency name='zone_network_setup' grouping='require_all' restart_on='none' type='service'>
+    <service_fmri value='svc:/oxide/zone-network-setup:default' />
+  </dependency>
+
   <exec_method type='method' name='start'
     exec='ctrun -l child -o noorphan,regent /opt/oxide/mgd/pkg/mgd_method_script.sh &amp;'
     timeout_seconds='0' />

From 31bff50a6ead485354ca15249924331ae7a8423d Mon Sep 17 00:00:00 2001
From: karencfv <karencfv@users.noreply.github.com>
Date: Fri, 3 May 2024 14:40:44 +1200
Subject: [PATCH 2/2] workaround

---
 smf/ddm/manifest.xml | 4 ++--
 smf/mgd/manifest.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/smf/ddm/manifest.xml b/smf/ddm/manifest.xml
index cf312c4e..08af6d03 100644
--- a/smf/ddm/manifest.xml
+++ b/smf/ddm/manifest.xml
@@ -10,11 +10,11 @@
   <service_fmri value='svc:/milestone/network:default' />
   </dependency>
 
-  <dependency name='zone_network_setup' grouping='require_all' restart_on='none' type='service'>
+  <dependency name='zone_network_setup' grouping='optional_all' restart_on='none' type='service'>
     <service_fmri value='svc:/oxide/zone-network-setup:default' />
   </dependency>
 
-  <dependency name='switch_zone_setup' grouping='require_all' restart_on='none' type='service'>
+  <dependency name='switch_zone_setup' grouping='optional_all' restart_on='none' type='service'>
     <service_fmri value='svc:/oxide/switch_zone_setup:default' />
   </dependency>
 
diff --git a/smf/mgd/manifest.xml b/smf/mgd/manifest.xml
index 72b22080..4c7ef562 100644
--- a/smf/mgd/manifest.xml
+++ b/smf/mgd/manifest.xml
@@ -10,7 +10,7 @@
   <service_fmri value='svc:/milestone/network:default' />
   </dependency>
 
-  <dependency name='zone_network_setup' grouping='require_all' restart_on='none' type='service'>
+  <dependency name='zone_network_setup' grouping='optional_all' restart_on='none' type='service'>
     <service_fmri value='svc:/oxide/zone-network-setup:default' />
   </dependency>