rpm/ignition
SHA256
1
0
Fork 0
forked from pool/ignition
Code Pull Requests Activity

Accepting request 832022 from home:fos:branches:devel:kubic:ignition

Browse Source 
- 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
This commit is contained in:
Fabian Vogt 2020-09-04 07:44:25 +00:00 committed by Git OBS Bridge
parent 5ef30673f6
commit 54b5c14dc3
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ignition-suse-generator
View File

@ -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

8
ignition.changes
View File

@ -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>

1
ignition.spec
View File

@ -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

2
module-setup.sh
View File

@ -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() {