Accepting request 1289304 from devel:kubic:ignition

OBS-URL: https://build.opensuse.org/request/show/1289304
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=50

ignition-suse-generator

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 set -e
 
@@ -42,12 +40,24 @@ add_requires ignition-umount-initrd-fstab.service ignition-files.service
 add_requires ignition-enable-network.service ignition-fetch.service
 
 if [ -z "${PLATFORM_ID}" ]; then
-    platform="$(systemd-detect-virt || true)"
-    case "${platform}" in
-        *vmware*)     platform="vmware" ;;
-        *oracle*)     platform="virtualbox" ;;
-        *kvm*|*qemu*) platform="qemu" ;;
-        *)            platform="metal" ;;
+    platform="metal"
+    detectedvirt="$(systemd-detect-virt || true)"
+    case "${detectedvirt}" in
+       *vmware*)
+            if modinfo -F name vmw_vsock_virtio_transport >/dev/null; then
+                platform="vmware"
+            fi
+            ;;
+        *oracle*)
+            if modinfo -F name vboxguest >/dev/null; then
+                platform="virtualbox"
+            fi
+            ;;
+        *kvm*|*qemu*)
+            if modinfo -F name qemu_fw_cfg >/dev/null; then
+                platform="qemu"
+            fi
+            ;;
     esac
     echo "PLATFORM_ID=${platform}" > /run/ignition.env
 fi

ignition.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 30 14:08:02 UTC 2025 - Ignaz Forster <iforster@suse.com>
+
+- ignition-suse-generator: Only use Ignition platform ID when
+  the corresponding kernel modules are found
+  [bsc#1234315] [boo#1230668] [gh#coreos/ignition#1984]
+
 -------------------------------------------------------------------
 Tue Apr 01 11:56:36 UTC 2025 - iforster@suse.com
 

module-setup.sh

@@ -41,7 +41,7 @@ install() {
         "/usr/sbin/ignition-enable-network"
     inst_script "$moddir/ignition-setup-user.sh" \
         "/usr/sbin/ignition-setup-user"
-    inst_multiple awk systemd-detect-virt cryptsetup
+    inst_multiple awk systemd-detect-virt cryptsetup modinfo
     install_ignition_unit ignition-remove-reconfig_system.service initrd.target
     install_ignition_unit ignition-setup-user.service
 }