3 files changed, 30 insertions, 1 deletions

diff --git a/classes/image-oci-umoci.inc b/classes/image-oci-umoci.inc
index c77750fb..9bd154fb 100644
--- a/classes/image-oci-umoci.inc
+++ b/classes/image-oci-umoci.inc
@@ -50,7 +50,7 @@ IMAGE_CMD:oci() {
 
     bbdebug 1 "OCI: populating rootfs"
     bbdebug 1 "OCI: cp -r ${IMAGE_ROOTFS}/* $image_bundle_name/rootfs/"
-    cp -r ${IMAGE_ROOTFS}/* $image_bundle_name/rootfs
+    cp -r -a --no-preserve=ownership ${IMAGE_ROOTFS}/* $image_bundle_name/rootfs
 
     bbdebug 1 "OCI: umoci repack --image $image_name:${OCI_IMAGE_TAG} $image_bundle_name"
     umoci repack --image $image_name:${OCI_IMAGE_TAG} $image_bundle_name
diff --git a/classes/qemuboot-testimage-network.bbclass b/classes/qemuboot-testimage-network.bbclass
index 57e03551..ca65de6c 100644
--- a/classes/qemuboot-testimage-network.bbclass
+++ b/classes/qemuboot-testimage-network.bbclass
@@ -2,6 +2,9 @@
 # the Qemu MACHINES: it removes all external network interfaces
 # by default. However, eth0 is needed for testimage, so enable it here.
 
+# NOTE: systemd configuration can be found in the virt_networking
+#       bbclass and associated packages
+
 # If QB_NETWORK_XEN_BRIDGE is set, configure bridging for the network.
 QB_NETWORK_XEN_BRIDGE ??= ""
 
diff --git a/classes/virt_networking.bbclass b/classes/virt_networking.bbclass
new file mode 100644
index 00000000..e92e1de5
--- /dev/null
+++ b/classes/virt_networking.bbclass
@@ -0,0 +1,26 @@
+# Similarly to the cni_networking.bbclass this class should be
+# inherted by recipes to produce a package that contains their
+# desired networking configuration.
+#
+# Currently only systemd networking is supported, but this will
+# be extended in the future
+#
+# By simply specifying the configuration / networking files,
+# they will be package and then eventually installed to the
+# correct target location.
+#
+PACKAGES:prepend = "${PN}-net-conf "
+FILES:${PN}-net-conf = "${sysconfdir}/systemd/network/*"
+
+do_install:append() {
+    if [ -z "${VIRT_NETWORKING_FILES}" ]; then
+        bbfatal "virt-networking was inherited, but no networking configuration was provided via VIRT_NETWORKING_FILES"
+    fi
+
+    # TODO: possibily make the systemd configuration conditional on the init manager
+    install -d "${D}/${sysconfdir}/systemd/network/"
+    for f in ${VIRT_NETWORKING_FILES}; do
+        conf_name="$(basename $f)"
+        install -D -m 0644 "$f" "${D}/${sysconfdir}/systemd/network/$conf_name"
+    done
+}