Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse datasources in all cases except uki normal boot #1151

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Parse datasources in all cases except uki normal boot #1151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b16d962
Parse datasources in all cases except uki normal boot
jimmykarily Nov 25, 2024
c137048
Merge branch 'main' into 3035-only-skip-datasources-in-uki
Itxaka Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Parse datasources in all cases except uki normal boot 
Fixes kairos-io/kairos#3035

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
  • Loading branch information
@jimmykarily
jimmykarily committed Nov 25, 2024
commit b16d962fae607fa32caf38bf86f1190e01c1146a
2 changes: 1 addition & 1 deletion packages/static/kairos-overlay-files/collection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:
- name: "kairos-overlay-files"
category: "static"
version: "1.6.0"
version: "1.6.1"
5 changes: 1 addition & 4 deletions packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The removed code was a bit redundant or am I missing something? In any case, we said we want this to be enabled in all cases except when uki is booting in normal mode. So this condition should be enough, no?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this should be enough!

name: "Pull data from provider"
datasource:
providers: ["cdrom", "gcp", "openstack", "aws", "azure", "hetzner", "packet", "vultr", "digitalocean", "metaldata", "vmware", "config-drive"]
Expand Down
Loading