Accepting request 832023 from devel:kubic:ignition

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

ignition-suse-generator

@@ -24,10 +24,10 @@ EOF
 fi
 
 if [ -z "${PLATFORM_ID}" ]; then
-    platform="$(virt-what)"
+    platform="$(systemd-detect-virt)"
     case "${platform}" in
         *vmware*)     platform="vmware" ;;
-        *virtualbox*) platform="virtualbox" ;;
+        *oracle*)     platform="virtualbox" ;;
         *kvm*|*qemu*) platform="qemu" ;;
         *)            platform="metal" ;;
     esac

ignition.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  3 15:04:30 UTC 2020 - Ignaz Forster <iforster@suse.com>
+
+- Change virtualization detection from virt-what to
+  systemd-detect-virt; this avoids a dependency to a hardcoded
+  libexec path in module-setup.sh (which broke during the recent
+  migration to /usr/libexec)
+
 -------------------------------------------------------------------
 Tue Aug 18 11:56:54 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 

ignition.spec

@@ -41,13 +41,12 @@ Patch2:         0002-allow-multiple-mounts-of-same-device.patch
 Patch3:         0003-fix-i386-build.patch
 Patch4:         ignition-fix-arm32-installation.patch
 BuildRequires:  dracut
-BuildRequires:  golang(API) >= 1.12
 BuildRequires:  libblkid-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  update-bootloader-rpm-macros
+BuildRequires:  golang(API) >= 1.12
 Requires:       %{name}-dracut-grub2
 Requires:       dracut
-Requires:       virt-what
 Recommends:     %{_sbindir}/groupadd
 Recommends:     %{_sbindir}/sgdisk
 Recommends:     %{_sbindir}/useradd

module-setup.sh

@@ -19,7 +19,7 @@ install() {
         "/usr/sbin/ignition-enable-network"
     inst_script "$moddir/ignition-setup-user-suse.sh" \
         "/usr/sbin/ignition-setup-user-suse"
-    inst_multiple awk virt-what /usr/lib/virt-what-cpuid-helper id which dmidecode
+    inst_multiple awk systemd-detect-virt
 }
 
 installkernel() {