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.

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

Conversation

jimmykarily
Copy link
Contributor

@jimmykarily jimmykarily self-assigned this Nov 25, 2024
@jimmykarily jimmykarily requested a review from a team November 25, 2024 10:47
@jimmykarily jimmykarily marked this pull request as ready for review November 25, 2024 10:47
(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!

@jimmykarily jimmykarily merged commit 8b820bd into main Nov 25, 2024
11 checks passed
@jimmykarily jimmykarily deleted the 3035-only-skip-datasources-in-uki branch November 25, 2024 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Apply the datasources fix only on UKI mode
2 participants