Skip to content

feat(eif): embed os-release into rpm2eif rootfs #720

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.

Sign up for GitHub

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

Draft
jmt-lab wants to merge 1 commit into from
Draft

feat(eif): embed os-release into rpm2eif rootfs #720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions twoliter/embedded/rpm2eif
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,28 @@ ENCRYPTED_STORAGE=false
STANDALONE_IMAGE=true
EOF

echo "=== Embedding os-release ==="
# Append Bottlerocket variant, version, and build metadata to
# /usr/lib/os-release, mirroring the corresponding block in rpm2img so that
# EIF-built rootfs images expose the same identifying fields (VARIANT_ID,
# VERSION_ID, BUILD_ID, VENDOR_NAME, ...) to userspace. Unlike rpm2img, EIF
# variants have INSTALL_ROOT already pointing at the merged sysroot, so
# there is no `${ARCH}-bottlerocket-linux-gnu/sys-root` prefix.
VERSION="${VERSION_ID} (${VARIANT})"
# shellcheck disable=SC2154 # PROJECT_VENDOR/PRETTY_NAME come from the build env.
cat <<EOF >>"${INSTALL_ROOT}/usr/lib/os-release"
VERSION="${VERSION}"
PRETTY_NAME="${PRETTY_NAME} ${VERSION}"
VARIANT_ID=${VARIANT}
VERSION_ID=${VERSION_ID}
BUILD_ID=${BUILD_ID}
VENDOR_NAME="${PROJECT_VENDOR}"
HOME_URL="https://github.com/bottlerocket-os/bottlerocket"
SUPPORT_URL="https://github.com/bottlerocket-os/bottlerocket/discussions"
BUG_REPORT_URL="https://github.com/bottlerocket-os/bottlerocket/issues"
DOCUMENTATION_URL="https://bottlerocket.dev"
EOF

echo "=== Creating rootfs.erofs ==="
# Remove only the top-level /boot from rootfs (kernel is shipped separately).
[[ -d "${INSTALL_ROOT}/boot" ]] && rm -rf "${INSTALL_ROOT}/boot"
Expand Down
Loading