but make it work, for real

9-container.yml

@@ -1,8 +1,9 @@
 - imagename: Rocky-9-Container
-  types: [raw]
+  types: [tar]
   docker-target: git.resf.org/sig_cloud/images:9.3
   elements: [rocky-container-base]
   arch: ppc64le
   environment:
     DIB_ARCHITECTURE: ppc64le
     DIB_YUM_DNF_CONTENTDIR: stg/rocky
+    DIB_AVOID_ISCSI: '1'

diskimage-builder

@@ -1 +1 @@
-Subproject commit e2c20bf2cff0721fc1724afe1d979a382bfdbe04
+Subproject commit 16026735e5b3f4f8f05dd3adc2c93d41f5d2f111

elements/rocky-minimal-yum/package-installs.yaml

@@ -18,5 +18,6 @@ lsb_release:
 rootfiles:
 tar:
 usermode:
+systemd-libs:
 vim-minimal:
 yum:

elements/rocky-minimal-yum/pkg-map

@@ -2,8 +2,6 @@
   "family": {
     "redhat": {
       "lsb_release": "ed hostname patch postfix tar time"
-      "iscsi_package": " "
-      "open-iscsi": " "
     }
   }
 }

elements/rocky-minimal-yum/post-install.d/80-cleanup-locales-etc

@@ -32,21 +32,22 @@ rm -fr /home/ansible/
 
 # systemd fixes
 :> /etc/machine-id
-systemd-tmpfiles --create --boot
 
-# mask mounts and login bits
-systemctl mask \
-    console-getty.service \
-    dev-hugepages.mount \
-    getty.target \
-    sys-fs-fuse-connections.mount \
-    systemd-logind.service \
-    systemd-remount-fs.service
+# We're not bundling systemd, so this isn't actually here, nor does it matter if these are masked..
+#
+# systemd-tmpfiles --create --boot
+#
+# # mask mounts and login bits
+# systemctl mask \
+#     console-getty.service \
+#     dev-hugepages.mount \
+#     getty.target \
+#     sys-fs-fuse-connections.mount \
+#     systemd-logind.service \
+#     systemd-remount-fs.service
 
 # Cleanup the image
 rm -fv /etc/udev/hwdb.bin
 rm -rfv /usr/lib/udev/hwdb.d/ \
        /boot /var/lib/dnf/history.* \
        "/tmp/*" "/tmp/.*" /var/log/* || true
-
-ls /dev/ -artlh

elements/rocky-minimal-yum/pre-install.d/03-yum-cleanup

@@ -32,3 +32,10 @@ rm -rf /sbin/sln
 # ldconfig
 rm -rf /etc/ld.so.cache /var/cache/ldconfig
 mkdir -p --mode=0755 /var/cache/ldconfig
+
+if [[ -n ${DIB_YUM_DNF_CONTENTDIR:-''} ]]; then
+  sudo cp /etc/dnf/vars/contentdir /etc/dnf/vars/contentdir.bak
+  echo $DIB_YUM_DNF_CONTENTDIR | sudo tee /etc/dnf/vars/contentdir
+  sudo sed -i -e 's,^mirrorlist,#mirrorlist,' -e 's,^#baseurl,baseurl,' /etc/yum.repos.d/*.repo
+fi
+