Skip to content

Commit 0d4031a

Browse files
authored
Merge pull request #1880 from apricote/hetzner
OEM: Provide Hetzner Images
2 parents 9209ab3 + 1cf9d7f commit 0d4031a

File tree

10 files changed

+33
-2
lines changed

10 files changed

+33
-2
lines changed

build_library/vm_image_util.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ VALID_IMG_TYPES=(
1515
digitalocean
1616
exoscale
1717
gce
18+
hetzner
1819
hyperv
1920
hyperv_vhdx
2021
iso
@@ -48,6 +49,7 @@ VALID_OEM_PACKAGES=(
4849
digitalocean
4950
exoscale
5051
gce
52+
hetzner
5153
hyperv
5254
openstack
5355
packet
@@ -278,6 +280,12 @@ IMG_azure_OEM_USE=azure
278280
IMG_azure_OEM_PACKAGE=common-oem-files
279281
IMG_azure_OEM_SYSEXT=oem-azure
280282

283+
## hetzner
284+
IMG_hetzner_DISK_LAYOUT=vm
285+
IMG_hetzner_OEM_USE=hetzner
286+
IMG_hetzner_OEM_PACKAGE=common-oem-files
287+
IMG_hetzner_OEM_SYSEXT=oem-hetzner
288+
281289
## hyper-v
282290
IMG_hyperv_DISK_FORMAT=vhd
283291
IMG_hyperv_OEM_PACKAGE=oem-hyperv
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Added Hetzner images ([flatcar/scripts#1880](https://github.com/flatcar/scripts/pull/1880))

sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ ConditionKernelCommandLine=|coreos.oem.id=packet
1919

2020
ConditionKernelCommandLine=|flatcar.oem.id=scaleway
2121

22+
ConditionKernelCommandLine=|flatcar.oem.id=hetzner
23+
2224
Description=Flatcar Metadata Agent
2325

2426
[Service]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fi
3131
COMMON_OEMIDS=(
3232
ami
3333
azure
34+
hetzner
3435
openstack
3536
packet
3637
qemu

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
1010
if [[ "${PV}" == 9999 ]]; then
1111
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
1212
else
13-
CROS_WORKON_COMMIT="f35d50bed4c6556fee3ee40fef0d35ee9f3bc2c5" # flatcar-master
13+
CROS_WORKON_COMMIT="96e929df6c04df58a87187cf2a769923e5ecdf41" # flatcar-master
1414
KEYWORDS="amd64 arm arm64 x86"
1515
fi
1616

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3+
<pkgmetadata>
4+
</pkgmetadata>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
DESCRIPTION="OEM suite for Hetzner"
7+
HOMEPAGE="https://hetzner.com"
8+
SRC_URI=""
9+
10+
LICENSE="GPL-2"
11+
SLOT="0"
12+
KEYWORDS="amd64 arm64"
13+
IUSE=""
14+
15+
OEM_NAME="Hetzner"

sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
1010
if [[ "${PV}" == 9999 ]]; then
1111
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
1212
else
13-
CROS_WORKON_COMMIT="6c2fba412dbce9a011535a9e57332e1307072855" # flatcar-master
13+
CROS_WORKON_COMMIT="78d94b311ddb047b280c5ee180410b48ec04ea39" # flatcar-master
1414
KEYWORDS="amd64 arm arm64 x86"
1515
fi
1616

0 commit comments

Comments
 (0)