Merge pull request #2542 from flatcar/kai/initrd-oem-ordering

sys-kernel/bootengine: Prevent OEM mount point from showing up early
This commit is contained in:
Kai Lüke 2023-03-20 13:37:38 +01:00 committed by GitHub
commit 93eef4eeac
3 changed files with 3 additions and 1 deletions

View File

@ -0,0 +1 @@
- Restored the support to specify OEM partition files in Ignition when `/usr/share/oem` is given as initrd mount point ([bootengine#58](https://github.com/flatcar/bootengine/pull/58))

View File

@ -0,0 +1 @@
- Specifying the OEM filesystem in Ignition to write files to `/usr/share/oem` is not needed anymore ([bootengine#58](https://github.com/flatcar/bootengine/pull/58))

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="0ba568efbcbb4112b3adedadbf46b753f757fe36" # flatcar-master CROS_WORKON_COMMIT="3ba6216024c75d502b9696d05f4f02594d52efbb" # flatcar-master
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi