Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

sys-apps/ignition: fix OEM detection #2277

Merged
merged 2 commits into from
Nov 10, 2022
Merged

sys-apps/ignition: fix OEM detection #2277

merged 2 commits into from
Nov 10, 2022

Conversation

tormath1
Copy link
Contributor

@tormath1 tormath1 commented Nov 10, 2022

In case the partition was OEM, the btrfs formatting was not forced if WipeFilesystem was not provided.

Signed-off-by: Mathieu Tortuyaux mtortuyaux@microsoft.com


Closes: flatcar/Flatcar#885

@tormath1 tormath1 self-assigned this Nov 10, 2022
@pothos
Copy link
Contributor

pothos commented Nov 10, 2022

In case the partition was OEM, the btrfs formatting was not forced if WipeFilesystem was not provided.

I think this would be clearer:

In case the OEM partition was specified with the name "OEM", the btrfs format was not forced because it only considered the name "oem".

In case the OEM partition was specified with the name "OEM",
the btrfs format was not forced because it only considered the name "oem".

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 tormath1 marked this pull request as ready for review November 10, 2022 16:03
@tormath1 tormath1 requested a review from a team November 10, 2022 16:03
@tormath1 tormath1 merged commit 6080206 into main Nov 10, 2022
@tormath1 tormath1 deleted the tormath1/ignition branch November 10, 2022 17:03
@tormath1
Copy link
Contributor Author

cherry-picked to:

  • flatcar-3417
  • flatcar-3402
  • flatcar-3374

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Old kernel boot options customization with Ignition v2 breaks booting
3 participants