NTP self assembling zone (#5168)

illumos-utils/src/running_zone.rs

@@ -1139,7 +1139,7 @@ impl InstalledZone {
 
 #[derive(Clone)]
 pub struct FakeZoneBuilderConfig {
-    temp_dir: Arc<Utf8TempDir>,
+    temp_dir: Arc<Utf8PathBuf>,
 }
 
 #[derive(Clone, Default)]
@@ -1157,10 +1157,14 @@ pub struct ZoneBuilderFactory {
 
 impl ZoneBuilderFactory {
     /// For use in unit tests that don't require actual zone creation to occur.
-    pub fn fake() -> Self {
+    pub fn fake(temp_dir: Option<&String>) -> Self {
+        let temp_dir = match temp_dir {
+            Some(dir) => Utf8PathBuf::from(dir),
+            None => Utf8TempDir::new().unwrap().into_path(),
+        };
         Self {
             fake_cfg: Some(FakeZoneBuilderConfig {
-                temp_dir: Arc::new(Utf8TempDir::new().unwrap()),
+                temp_dir: Arc::new(temp_dir),
             }),
         }
     }
@@ -1280,7 +1284,7 @@ impl<'a> ZoneBuilder<'a> {
             .new_control(None)
             .map_err(move |err| InstallZoneError::CreateVnic { zone, err })?;
         let fake_cfg = self.fake_cfg.unwrap();
-        let temp_dir = fake_cfg.temp_dir.path().to_path_buf();
+        let temp_dir = fake_cfg.temp_dir;
         (|| {
             let full_zone_name = InstalledZone::get_zone_name(
                 self.zone_type?,

package-manifest.toml

@@ -273,12 +273,25 @@ output.type = "zone"
 [package.ntp]
 service_name = "ntp"
 only_for_targets.image = "standard"
+source.type = "composite"
+source.packages = [
+  "ntp-svc.tar.gz",
+  "opte-interface-setup.tar.gz",
+  "zone-network-setup.tar.gz",
+  "zone-network-install.tar.gz"
+]
+output.type = "zone"
+
+[package.ntp-svc]
+service_name = "ntp-svc"
+only_for_targets.image = "standard"
 source.type = "local"
 source.paths = [
 	{ from = "smf/ntp/manifest", to = "/var/svc/manifest/site/ntp" },
 	{ from = "smf/ntp/method", to = "/var/svc/method" },
 	{ from = "smf/ntp/etc", to = "/etc" },
 ]
+output.intermediate_only = true
 output.type = "zone"
 
 [package.omicron-gateway]