From 8b820bd0ba5c24ff76ac4a3707699c95e40a6fb5 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Mon, 25 Nov 2024 17:11:09 +0200 Subject: [PATCH] Parse datasources in all cases except uki normal boot (#1151) Fixes https://github.com/kairos-io/kairos/issues/3035 Signed-off-by: Dimitris Karakasilis Co-authored-by: Itxaka --- packages/static/kairos-overlay-files/collection.yaml | 2 +- .../kairos-overlay-files/files/system/oem/00_datasource.yaml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml index 282bcf6..68d98a4 100644 --- a/packages/static/kairos-overlay-files/collection.yaml +++ b/packages/static/kairos-overlay-files/collection.yaml @@ -1,4 +1,4 @@ packages: - name: "kairos-overlay-files" category: "static" - version: "1.6.0" + version: "1.6.1" diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml index f13291b..50419d2 100644 --- a/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml +++ b/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml @@ -2,10 +2,7 @@ name: "Datasource handling" stages: rootfs.before: - &datasource - if: | - (grep -q "install-mode" /proc/cmdline || grep -q "nodepair.enable" /proc/cmdline ) && \ - ([ -f /run/cos/live_mode ] || [ -f /run/cos/uki_install_mode ]) && \ - ( [ ! -f /oem/userdata ] ) + if: '[ ! -f /oem/userdata ] && [ ! -f /run/cos/uki_boot_mode ]' name: "Pull data from provider" datasource: providers: ["cdrom", "gcp", "openstack", "aws", "azure", "hetzner", "packet", "vultr", "digitalocean", "metaldata", "vmware", "config-drive"]