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

Change location of bootargs.conf #2013

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Conversation

frelon
Copy link
Contributor

@frelon frelon commented Mar 15, 2024

Use the same location as grub.conf, /etc/elemental.

The grub config is backwards compatible and tries to source from /etc/cos/bootargs.conf as well.

@frelon frelon requested a review from a team as a code owner March 15, 2024 12:56
@frelon frelon force-pushed the bootargs-etc-elemental branch from 3d99580 to 0a55eb9 Compare March 15, 2024 13:35
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.56%. Comparing base (3028919) to head (0a55eb9).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2013   +/-   ##
=======================================
  Coverage   72.56%   72.56%           
=======================================
  Files          76       76           
  Lines        8907     8907           
=======================================
  Hits         6463     6463           
  Misses       1910     1910           
  Partials      534      534           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@davidcassany davidcassany left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -57,6 +57,12 @@ function set_loopdevice {
loopback ${volume} ${1}
}

## Sources bootargs from the current volume
function source_bootargs {
source (${volume})/etc/cos/bootargs.cfg
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this failing if the file is not there? 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not when I tried it.. I was going to check if the file existed first but seems like it's not needed 🤷

Use the same location as grub.conf, /etc/elemental.

The grub config is backwards compatible and tries to source from
/etc/cos/bootargs.conf as well.

Signed-off-by: Fredrik Lönnegren <fredrik.lonnegren@suse.com>
@frelon frelon force-pushed the bootargs-etc-elemental branch from 0a55eb9 to 4304a93 Compare March 15, 2024 14:35
@frelon frelon enabled auto-merge (squash) March 15, 2024 14:36
@frelon frelon merged commit a2c4f0b into rancher:main Mar 15, 2024
17 checks passed
@frelon frelon deleted the bootargs-etc-elemental branch April 10, 2024 08:42
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.

3 participants