flatcar · tuunit · Nov 4, 2024 · Jan 16, 2025 · Jan 17, 2025 · Feb 4, 2025
diff --git a/build_library/disk_layout.json b/build_library/disk_layout.json
@@ -104,6 +104,16 @@
         "fs_type":"ext2"
       }
     },
+    "ionoscloud":{
+      "6":{
+        "fs_type":"ext4"
+      },
+      "9":{
+        "label":"ROOT",
+        "fs_label":"ROOT",
+        "blocks":"12943360"
+      }
+    },
     "container":{
       "1":{
         "type":"blank"

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
@@ -42,6 +42,8 @@ VALID_IMG_TYPES=(
     vmware_ova
     vmware_raw
     xen
+    ionoscloud
+    ionoscloud_raw
 )
 
 #list of oem package names, minus the oem- prefix
@@ -68,6 +70,7 @@ VALID_OEM_PACKAGES=(
     vagrant-virtualbox
     virtualbox
     vmware
+    ionoscloud
 )
 
 # Set at runtime to one of the above types
@@ -341,6 +344,18 @@ IMG_proxmoxve_OEM_PACKAGE=common-oem-files
 IMG_proxmoxve_OEM_USE=proxmoxve
 IMG_proxmoxve_OEM_SYSEXT=oem-proxmoxve
 
+## ionoscloud
+IMG_ionoscloud_OEM_USE=ionoscloud
+IMG_ionoscloud_OEM_PACKAGE=oem-ionoscloud
+IMG_ionoscloud_DISK_LAYOUT=ionoscloud
+IMG_ionoscloud_DISK_FORMAT=qcow2
+IMG_ionoscloud_DISK_EXTENSION=qcow2
+
+## ionoscloud_raw
+IMG_ionoscloud_raw_OEM_USE=ionoscloud
+IMG_ionoscloud_raw_OEM_PACKAGE=oem-ionoscloud-raw
+IMG_ionoscloud_raw_DISK_LAYOUT=ionoscloud
+
 ###########################################################
 
 # Print the default vm type for the specified board

diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh
@@ -138,7 +138,7 @@ function _vm_build_impl() {
             COMPRESSION_FORMAT="bz2,none"
         elif [[ "${format}" =~ ^(hyperv|hyperv_vhdx)$ ]];then
             COMPRESSION_FORMAT="zip"
-        elif [[ "${format}" =~ ^(scaleway|kubevirt|proxmoxve)$ ]];then
+        elif [[ "${format}" =~ ^(scaleway|kubevirt|proxmoxve|ionoscloud)$ ]];then
             COMPRESSION_FORMAT="none"
         elif [[ "${format}" =~ ^(akamai)$ ]];then
             COMPRESSION_FORMAT="gz"

diff --git a/sdk_container/.repo/manifests/version.txt b/sdk_container/.repo/manifests/version.txt
@@ -1,4 +1,4 @@
-FLATCAR_VERSION=4207.0.0+nightly-20250106-2100
-FLATCAR_VERSION_ID=4207.0.0
-FLATCAR_BUILD_ID="nightly-20250106-2100"
+FLATCAR_VERSION=4204.0.0+nightly-20250103-2100-7-g83c4e5a2a4
+FLATCAR_VERSION_ID=4204.0.0
+FLATCAR_BUILD_ID="nightly-20250103-2100-7-g83c4e5a2a4"
 FLATCAR_SDK_VERSION=4207.0.0+nightly-20250106-2100
diff --git a/...tainer/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service b/...tainer/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service
@@ -27,6 +27,8 @@ ConditionKernelCommandLine=|flatcar.oem.id=akamai
 
 ConditionKernelCommandLine=|flatcar.oem.id=proxmoxve
 
+ConditionKernelCommandLine=|flatcar.oem.id=ionoscloud
+
 Description=Flatcar Metadata Agent
 
 [Service]

diff --git a/.../src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/.../src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-EGIT_REPO_URI="https://github.com/flatcar/coreos-cloudinit.git"
+EGIT_REPO_URI="https://github.com/tuunit/flatcar-cloudinit.git"
 COREOS_GO_PACKAGE="github.com/flatcar/coreos-cloudinit"
 COREOS_GO_GO111MODULE="on"
 inherit git-r3 systemd toolchain-funcs udev coreos-go
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	EGIT_COMMIT="f3aaab923de5075524780716635f25564b5e6934" # flatcar-master
+	EGIT_COMMIT="a0a73022ef2af493b029b145d4235b5a8360afe1" # feat/ionoscloud-support
 	KEYWORDS="amd64 arm64"
 fi
 

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -3,19 +3,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-EGIT_REPO_URI="https://github.com/flatcar/init.git"
+EGIT_REPO_URI="https://github.com/tuunit/flatcar-init.git"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit git-r3 systemd python-any-r1
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	EGIT_COMMIT="b5a6cbcfaabe605e28e075b8ac674edaf576a0eb" # flatcar-master
+	EGIT_COMMIT="5e39ca5d2e5e85217704cefdfa9f2f128ecf822f" # feat/ionoscloud-support
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit git-r3 systemd python-any-r1
-
 DESCRIPTION="Init scripts for CoreOS"
 HOMEPAGE="http://www.coreos.com/"
 SRC_URI=""

diff --git a/...ird_party/coreos-overlay/coreos-base/oem-ionoscloud-raw/files/USER_DATA_INJECTION_FLATCAR b/...ird_party/coreos-overlay/coreos-base/oem-ionoscloud-raw/files/USER_DATA_INJECTION_FLATCAR
@@ -0,0 +1,4 @@
+# DO NOT EDIT FILE
+# MANAGED BY IONOS CLOUD
+#
+# INDICATOR FILE FOR USER DATA INJECTION
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud-raw/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud-raw/files/grub.cfg
@@ -0,0 +1,4 @@
+# Flatcar GRUB settings
+
+set oem_id="ionoscloud"
+set linux_append="flatcar.autologin"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud-raw/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud-raw/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/...src/third_party/coreos-overlay/coreos-base/oem-ionoscloud-raw/oem-ionoscloud-raw-0.ebuild b/...src/third_party/coreos-overlay/coreos-base/oem-ionoscloud-raw/oem-ionoscloud-raw-0.ebuild
@@ -0,0 +1,21 @@
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OEM suite for raw IONOS Cloud image"
+HOMEPAGE="https://cloud.ionos.com"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+# no source directory
+S="${WORKDIR}"
+
+src_install() {
+	insinto "/oem"
+	doins "${FILESDIR}/grub.cfg"
+	doins "${FILESDIR}/USER_DATA_INJECTION_FLATCAR"
+}
diff --git a/...c/third_party/coreos-overlay/coreos-base/oem-ionoscloud/files/USER_DATA_INJECTION_FLATCAR b/...c/third_party/coreos-overlay/coreos-base/oem-ionoscloud/files/USER_DATA_INJECTION_FLATCAR
@@ -0,0 +1,4 @@
+# DO NOT EDIT FILE
+# MANAGED BY IONOS CLOUD
+#
+# INDICATOR FILE FOR USER DATA INJECTION
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud/files/grub.cfg
@@ -0,0 +1,4 @@
+# Flatcar GRUB settings
+
+set oem_id="ionoscloud"
+set linux_append="flatcar.autologin ignition.config.device=OEM ignition.config.path=config/user-data"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/...ntainer/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud/oem-ionoscloud-0.ebuild b/...ntainer/src/third_party/coreos-overlay/coreos-base/oem-ionoscloud/oem-ionoscloud-0.ebuild
@@ -0,0 +1,21 @@
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OEM suite for IONOS Cloud"
+HOMEPAGE="https://cloud.ionos.com"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+# no source directory
+S="${WORKDIR}"
+
+src_install() {
+	insinto "/oem"
+	doins "${FILESDIR}/grub.cfg"
+	doins "${FILESDIR}/USER_DATA_INJECTION_FLATCAR"
+}