Expand ensure_dir to allow copying subdirectories #4

smklein · 2023-03-03T15:14:03Z

No description provided.

smklein · 2023-03-03T15:16:44Z

src/main.rs

+                ensure::directory(log, &dst, owner, group, mode)?;
+
+                if let Some(extsrc) = &extsrc {
+                    if extsrc.starts_with('/') {
+                        bail!("external source directory must be a relative path");
+                    }
+                    let dst = PathBuf::from(dst);
+
+                    // "src" is the absolute path to a directory to be copied.
+                    let src = ib.external_src_dir(extsrc)?;
+
+                    for entry in walkdir::WalkDir::new(&src) {
+                        let entry = entry?;
+                        let from = entry.path();
+                        let to = dst.join(from.strip_prefix(&src)?);
+                        if entry.file_type().is_dir() {
+                            if let Err(e) = std::fs::create_dir(to) {
+                                if !matches!(e.kind(), std::io::ErrorKind::AlreadyExists) {
+                                    return Err(e.into());
+                                }
+                            }
+                        } else if entry.file_type().is_file() {
+                            std::fs::copy(from, to)?;
+                        }
+                    }
+                }


This is the meat of this PR - I more-or-less mimicked how ensure_file seems to work with pulling extsrc files, but expanded that to work for directories too.

My expectation is that we'll: 1. Download `global-zone-packages.tar.gz` in the `helios` repo 2. Unpack the contents into a staging directory 3. Use [image builder to copy the contents of these services into the host OS image](illumos/image-builder#4) Additionally, I made the list of artifacts a bit more explicit. *Eventually* we could parse the package manifest to access this info, but for now, I don't want to include any "intermediate" artifacts that shouldn't be installed on a system.

Expand ensure_dir to allow copying subdirectories

f9a9897

smklein commented Mar 3, 2023

View reviewed changes

This was referenced Mar 3, 2023

[buildomat] Package all global zone tarballs into single tarball oxidecomputer/omicron#2475

Merged

Add sled-agent and maghemite to ZFS image, autoboot sled agent oxidecomputer/helios#57

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Expand ensure_dir to allow copying subdirectories #4

Expand ensure_dir to allow copying subdirectories #4

smklein commented Mar 3, 2023

smklein Mar 3, 2023

Expand ensure_dir to allow copying subdirectories #4

Are you sure you want to change the base?

Expand ensure_dir to allow copying subdirectories #4

Conversation

smklein commented Mar 3, 2023

smklein Mar 3, 2023

Choose a reason for hiding this comment