mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-21 21:51:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3231 from flatcar/krnowak/hyperv-sysext

Browse Source 
Change oem-hyperv to use OEM sysext
This commit is contained in:
Krzesimir Nowak 2025-08-29 16:28:00 +02:00 committed by GitHub
commit ca58095e40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_library/disk_util
View File

@ -799,7 +799,7 @@ def Verity(options):
'--hash-offset', part['fs_bytes'], '--hash-offset', part['fs_bytes'],
loop_dev, loop_dev]).decode('utf8') loop_dev, loop_dev]).decode('utf8')
print(verityout.strip()) print(verityout.strip())
m = re.search("Root hash:\s+([a-f0-9]{64})$", verityout, re.IGNORECASE|re.MULTILINE) m = re.search(r'Root hash:\s+([a-f0-9]{64})$', verityout, re.IGNORECASE|re.MULTILINE)
if not m: if not m:
raise Exception("Failed to parse verity output!") raise Exception("Failed to parse verity output!")

9
build_library/vm_image_util.sh
View File

@ -299,12 +299,15 @@ IMG_hetzner_OEM_SYSEXT=oem-hetzner
## hyper-v ## hyper-v
IMG_hyperv_DISK_FORMAT=vhd IMG_hyperv_DISK_FORMAT=vhd
IMG_hyperv_OEM_PACKAGE=oem-hyperv IMG_hyperv_OEM_USE=hyperv
IMG_hyperv_OEM_PACKAGE=common-oem-files
IMG_hyperv_OEM_SYSEXT=oem-hyperv
## hyper-v vhdx ## hyper-v vhdx
IMG_hyperv_vhdx_DISK_FORMAT=vhdx IMG_hyperv_vhdx_DISK_FORMAT=vhdx
IMG_hyperv_vhdx_OEM_PACKAGE=oem-hyperv IMG_hyperv_vhdx_OEM_USE=hyperv
IMG_hyperv_vhdx_OEM_PACKAGE=common-oem-files
IMG_hyperv_vhdx_OEM_SYSEXT=oem-hyperv
## cloudsigma ## cloudsigma
IMG_cloudsigma_DISK_FORMAT=qcow2 IMG_cloudsigma_DISK_FORMAT=qcow2

1
changelog/changes/2025-08-29-hyperv-sysext.md Normal file
View File

@ -0,0 +1 @@
- Hyper-V images now use a systemd-sysext image for layering additional platform-specific software on top of `/usr`

1
sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r10.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r11.ebuild vendored
View File

@ -48,6 +48,7 @@ ARM64_ONLY_OEMIDS=(
AMD64_ONLY_OEMIDS=( AMD64_ONLY_OEMIDS=(
digitalocean digitalocean
gce gce
hyperv
vmware vmware
) )

18
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.1.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.2.0.ebuild vendored
View File

@ -1,7 +1,7 @@
# Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
DESCRIPTION="OEM suite for Hyper-V" DESCRIPTION="OEM suite for Hyper-V"
HOMEPAGE="" HOMEPAGE=""
@ -12,21 +12,11 @@ SLOT="0"
KEYWORDS="amd64" KEYWORDS="amd64"
IUSE="" IUSE=""
# no source directory
S="${WORKDIR}"
RDEPEND=" RDEPEND="
app-emulation/hv-daemons app-emulation/hv-daemons
" "
src_prepare() { OEM_NAME="Microsoft Hyper-V"
default
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
"${FILESDIR}/oem-release" > "${T}/oem-release" || die
}
src_install() { # no source directory
insinto "/oem" S="${WORKDIR}"
doins "${FILESDIR}/grub.cfg"
doins "${T}/oem-release"
}