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

🐛 Fix bootargs matcher for rpi #1810

Merged
merged 2 commits into from
Sep 12, 2023

Conversation

Itxaka
Copy link
Member

@Itxaka Itxaka commented Sep 12, 2023

It was matching before on ubuntu flavours and copying the debian one all the time in rpi stuff

Also adds a check to copy it only if its not there already so we dont touch it on other artifacts

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Itxaka and others added 2 commits September 12, 2023 14:59
It was matching before on ubuntu flavours and copying the debian one all
the time in rpi stuff

Also adds a check to copy it only if its not there already so we dont
touch it on other artifacts

Signed-off-by: Itxaka <[email protected]>
@Itxaka Itxaka requested a review from jimmykarily September 12, 2023 13:01
COPY ./images/alpine/bootargs.cfg /framework/etc/cos/bootargs.cfg
ELSE IF [[ "$FLAVOR" = "ubuntu-20-lts-arm-nvidia-jetson-agx-orin" ]]
COPY ./images/nvidia/bootargs.cfg /framework/etc/cos/bootargs.cfg
ELSE IF [[ "$FLAVOR" =~ "ubuntu" ]] && [[ ! "$FLAVOR" =~ -rpi$ ]]
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the main change, checking negative regex on rpi so we dont enter here if its ubuntu-*-rpi

@Itxaka
Copy link
Member Author

Itxaka commented Sep 12, 2023

not waiting for CI as it wont fail or anything

@Itxaka Itxaka merged commit 328b877 into kairos-io:master Sep 12, 2023
6 of 8 checks passed
@Itxaka Itxaka deleted the fix_bootargs_rpi_matcher branch September 12, 2023 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants