mkcw: use xfsprogs -p to populate XFS filesystems

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Author: nalind

internal/mkcw/makefs.go

@@ -10,14 +10,11 @@ import (
 
 // MakeFS formats the imageFile as a filesystem of the specified type,
 // populating it with the contents of the directory at sourcePath.
-// Recognized filesystem types are "ext2", "ext3", "ext4", and "btrfs".
+// Recognized filesystem types are "btrfs", "ext2", "ext3", "ext4", and "xfs".
 // Note that krun's init is currently hard-wired to assume "ext4".
 // Returns the stdout, stderr, and any error returned by the mkfs command.
 func MakeFS(sourcePath, imageFile, filesystem string) (string, string, error) {
 	var stdout, stderr strings.Builder
-	// N.B. mkfs.xfs can accept a protofile via its -p option, but the
-	// protofile format doesn't allow us to supply timestamp information or
-	// specify that files are hard linked
 	switch filesystem {
 	case "ext2", "ext3", "ext4":
 		logrus.Debugf("mkfs -t %s --rootdir %q %q", filesystem, sourcePath, imageFile)
@@ -33,6 +30,16 @@ func MakeFS(sourcePath, imageFile, filesystem string) (string, string, error) {
 		cmd.Stderr = &stderr
 		err := cmd.Run()
 		return stdout.String(), stderr.String(), err
+	case "xfs":
+		// N.B. -p treating directories as source for the filesystem contents only
+		// available in xfsprogs-6.17.0 or later; before that, it only accepts prototype
+		// files
+		logrus.Debugf("mkfs -t %s -p %q %q", filesystem, sourcePath, imageFile)
+		cmd := exec.Command("mkfs", "-t", filesystem, "-p", sourcePath, imageFile)
+		cmd.Stdout = &stdout
+		cmd.Stderr = &stderr
+		err := cmd.Run()
+		return stdout.String(), stderr.String(), err
 	}
 	return "", "", fmt.Errorf("don't know how to make a %q filesystem with contents", filesystem)
 }

tests/chroot.bats

@@ -176,7 +176,7 @@ load helpers
   mkdir -p ${TEST_SCRATCH_DIR}/chroot/merged/var/lib/containers/storage
   chmod 755 ${TEST_SCRATCH_DIR}/chroot/merged/var/lib/containers/storage
   # https://github.com/podman-container-tools/buildah/issues/6967
-  # chown -R is not safe against concurent removal, it will exit 1 when
+  # chown -R is not safe against concurrent removal, it will exit 1 when
   # it happens but still walks all files so we can ignore the error here.
   # Bug: https://bugs.gnu.org/81444
   # Only once the fix landed in our test distro images coreutils version this workaround can be removed.