2 files changed, 47 insertions, 34 deletions
diff --git a/recipes-test/images/initramfs-bootrr-image.bb b/recipes-test/images/initramfs-bootrr-image.bb
deleted file mode 100644
index d813865..0000000
--- a/recipes-test/images/initramfs-bootrr-image.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Small ramdisk image for running bootrr"
-
-PACKAGE_INSTALL = " \
-    ${ROOTFS_BOOTSTRAP_INSTALL} \
-    busybox \
-    base-passwd \
-    devmem2 \
-    diag \
-    ethtool \
-    gptfdisk \
-    iperf2 \
-    iperf3 \
-    qrtr-apps \
-    lava-test-shell \
-    rmtfs \
-    tcpdump \
-    udev \
-"
-
-# Do not pollute the initrd image with rootfs features
-IMAGE_FEATURES = ""
-
-export IMAGE_BASENAME = "initramfs-bootrr-image"
-IMAGE_LINGUAS = ""
-
-LICENSE = "MIT"
-
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
-inherit core-image
-
-IMAGE_ROOTFS_SIZE = "8192"
-IMAGE_ROOTFS_EXTRA_SPACE = "0"
-
-BAD_RECOMMENDATIONS += "busybox-syslog"
diff --git a/recipes-test/images/initramfs-test-image.bb b/recipes-test/images/initramfs-test-image.bb
new file mode 100644
index 0000000..83ef315
--- /dev/null
+++ b/recipes-test/images/initramfs-test-image.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "Small ramdisk image for running tests (bootrr, etc)"
+
+PACKAGE_INSTALL = " \
+    ${ROOTFS_BOOTSTRAP_INSTALL} \
+    busybox \
+    base-passwd \
+    devmem2 \
+    diag \
+    ethtool \
+    gptfdisk \
+    iperf2 \
+    iperf3 \
+    lava-test-shell \
+    packagegroup-core-boot \
+    qrtr-apps \
+    rmtfs \
+    tcpdump \
+    udev \
+"
+
+# Do not pollute the initrd image with rootfs features
+IMAGE_FEATURES = "debug-tweaks"
+
+export IMAGE_BASENAME = "initramfs-test-image"
+IMAGE_LINGUAS = ""
+
+LICENSE = "MIT"
+
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
+
+# Disable installation of kernel and modules via packagegroup-core-boot
+NO_RECOMMENDATIONS = "1"
+
+# Enable local auto-login (on systemd) of the root user (local = serial port and
+# virtual console by default, can be configured).
+LOCAL_GETTY ?= " \
+    ${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service \
+    ${IMAGE_ROOTFS}${systemd_system_unitdir}/getty@.service \
+"
+local_autologin () {
+    sed -i -e 's/^\(ExecStart *=.*getty \)/\1--autologin root /' ${LOCAL_GETTY}
+}
+ROOTFS_POSTPROCESS_COMMAND += "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'local_autologin;', '', d)}"