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

modify /etc/os-release #1749

Merged
merged 2 commits into from
Sep 16, 2021
Merged

Conversation

jpculp
Copy link
Member

@jpculp jpculp commented Sep 14, 2021

Issue number:

N/A

Description of changes:

Adds HOME_URL, SUPPORT_URL, and BUG_REPORT_URL to /etc/os-release,
as well as the variant to the PRETTY_NAME and a new VERSION field.

OLD

NAME=Bottlerocket
ID=bottlerocket
PRETTY_NAME="Bottlerocket OS 1.2.0"
VARIANT_ID=aws-ecs-1
VERSION_ID=1.2.0
BUILD_ID=ccf1b754

NEW

NAME=Bottlerocket
ID=bottlerocket
VERSION="1.2.0 (aws-ecs-1)"
PRETTY_NAME="Bottlerocket OS 1.2.0 (aws-ecs-1)"
VARIANT_ID=aws-ecs-1
VERSION_ID=1.2.0
BUILD_ID=e0808b0b
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"

Testing done:

Built and launched aws-k8s-1.20 and aws-ecs-1 variants. Verified the expected changes via the admin container. Both instances connected to their respective clusters without issue, although the OS Image now reports as Bottlerocket OS 1.2.0 (aws-k8s-1.20) in EKS.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

tools/rpm2img Outdated Show resolved Hide resolved
This commit creates a VERSION field which is comprised of the VERSION_ID
and the variant in parenthesis. The VERSION field replaces VERSION_ID in
PRETTY_NAME.
@jpculp
Copy link
Member Author

jpculp commented Sep 14, 2021

Replaced the multiple echos with a single cat <<EOF >>, which is much easier to read.

Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🍭

@jpculp jpculp merged commit 0a82cf1 into bottlerocket-os:develop Sep 16, 2021
@jpculp jpculp deleted the modify-os-release branch September 16, 2021 22:46
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.

5 participants