Move net-setup to common instead of compliance-common.

Author: luqmana

image/templates/include/common.json

@@ -33,6 +33,17 @@
 
         { "t": "ensure_file", "file": "/etc/resolv.conf",
             "contents": "",
-            "owner": "root", "group": "root", "mode": "644" }
+            "owner": "root", "group": "root", "mode": "644" },
+
+        { "t": "ensure_dir", "dir": "/usr/lib/oxide",
+            "owner": "root", "group": "sys", "mode": "0755" },
+        { "t": "ensure_file", "file": "/usr/lib/oxide/net-setup.sh",
+            "src": "net-setup.sh",
+            "owner": "root", "group": "bin", "mode": "0755" },
+        { "t": "ensure_dir", "dir": "/lib/svc/manifest/oxide",
+            "owner": "root", "group": "sys", "mode": "0755" },
+        { "t": "ensure_file", "file": "/lib/svc/manifest/oxide/net-setup.xml",
+            "src": "net-setup.xml",
+            "owner": "root", "group": "sys", "mode": "0644" }
     ]
 }

image/templates/include/compliance-common.json

@@ -58,15 +58,6 @@
         { "t": "ensure_file",
             "file": "/lib/svc/manifest/site/compliance-dump.xml",
             "src": "compliance-dump.xml",
-            "owner": "root", "group": "bin", "mode": "0644" },
-
-        { "t": "ensure_file",
-            "file": "/usr/lib/oxide/net-setup",
-            "src": "net-setup.sh",
-            "owner": "root", "group": "bin", "mode": "0755" },
-        { "t": "ensure_file",
-            "file": "/lib/svc/manifest/oxide/net-setup.xml",
-            "src": "net-setup.xml",
             "owner": "root", "group": "bin", "mode": "0644" }
     ]
 }