1 files changed, 7 insertions, 3 deletions

diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb
index 47d28902c8..e4846fe4f6 100644
--- a/meta/recipes-core/systemd/systemd_237.bb
+++ b/meta/recipes-core/systemd/systemd_237.bb
@@ -584,9 +584,13 @@ pkg_prerm_${PN} () {
 PACKAGE_WRITE_DEPS += "qemu-native"
 pkg_postinst_udev-hwdb () {
         if test -n "$D"; then
-                ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \
-                        --root $D
-                chown root:root $D${sysconfdir}/udev/hwdb.bin
+                if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true','false', d)}; then
+                        ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \
+                                --root $D
+                        chown root:root $D${sysconfdir}/udev/hwdb.bin
+                else
+                        $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX}
+                fi
         else
                 udevadm hwdb --update
         fi