From 5ef30673f694e80cf9bc74d6a031271ebac40d3ff38b601eab4ebb0a1e0b27c6 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Fri, 4 Sep 2020 07:36:49 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=59 --- ignition.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 1e3ab13..1170231 100644 --- a/ignition.spec +++ b/ignition.spec @@ -41,10 +41,10 @@ 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 From 54b5c14dc3f37fb30f1c32d51a113f55cc97e9de8029c8d6260ab243c1daf8b3 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 4 Sep 2020 07:44:25 +0000 Subject: [PATCH 2/2] Accepting request 832022 from home:fos:branches:devel:kubic:ignition - 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) OBS-URL: https://build.opensuse.org/request/show/832022 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=60 --- ignition-suse-generator | 4 ++-- ignition.changes | 8 ++++++++ ignition.spec | 1 - module-setup.sh | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ignition-suse-generator b/ignition-suse-generator index 18195d3..cf89f83 100644 --- a/ignition-suse-generator +++ b/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 diff --git a/ignition.changes b/ignition.changes index c137422..9744167 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 3 15:04:30 UTC 2020 - Ignaz Forster + +- 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 diff --git a/ignition.spec b/ignition.spec index 1170231..0f533af 100644 --- a/ignition.spec +++ b/ignition.spec @@ -47,7 +47,6 @@ 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 diff --git a/module-setup.sh b/module-setup.sh index c3db3fb..0b54cf6 100644 --- a/module-setup.sh +++ b/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() {