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

Remove block: prefix in immutable-rootfs #1820

Merged
merged 1 commit into from
Sep 5, 2023
Merged

Conversation

frelon
Copy link
Contributor

@frelon frelon commented Sep 5, 2023

The wait_for_dev dracut function will wait for the device with that exact name. In later versions 'block:' is added in parse-rootfs in dracut which means we will wait for a device that will never exist.

The wait_for_dev dracut function will wait for the device with that
exact name. In later versions 'block:' is added in parse-rootfs in
dracut which means we will wait for a device that will never exist.

Signed-off-by: Fredrik Lönnegren <fredrik.lonnegren@suse.com>
@frelon frelon requested a review from a team as a code owner September 5, 2023 12:11
@frelon frelon enabled auto-merge (squash) September 5, 2023 12:18
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.

Looks good to me

@@ -43,7 +43,7 @@ esac

info "root device set to root=${root}"

wait_for_dev -n "${root}"
wait_for_dev -n "${root#block:}"
Copy link
Contributor

Choose a reason for hiding this comment

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

I assume the change is backward compatible, I mean it will also work on old dracut versions, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it will only remove block: prefix if it exists. 👍

@frelon frelon merged commit da9e560 into rancher:main Sep 5, 2023
@frelon frelon deleted the dracut-fix branch September 5, 2023 14:18
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