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

lib/deploy: Don't include version twice in bootmenu title #1829

Closed
wants to merge 1 commit into from

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Mar 1, 2019

In Silverblue right now, the boot menu title looks like this:

Fedora 29.20190301.0 (Workstation Edition) 29.20190301.0 (ostree)

This is because RPM-OSTree's mutate-os-release feature is enabled,
which injects the OSTree version string directly into VERSION and
PRETTY_NAME. So appending the version string again is a bit redundant.
Let's just do a simple substring check here before adding the version to
the title.

In Silverblue right now, the boot menu title looks like this:

    Fedora 29.20190301.0 (Workstation Edition) 29.20190301.0 (ostree)

This is because RPM-OSTree's `mutate-os-release` feature is enabled,
which injects the OSTree version string directly into `VERSION` and
`PRETTY_NAME`. So appending the version string again is a bit redundant.
Let's just do a simple substring check here before adding the version to
the title.
@jlebon
Copy link
Member Author

jlebon commented Mar 1, 2019

I guess this doesn't catch the case where the OS name really does have a number in it and then the version string happens to match exactly that number. E.g. TestOS 42 is the actual OS name, and then TestOS 42 version 42 would just have the title TestOS 42 instead of TestOS 42 42... but why do this to your users?

@cgwalters
Copy link
Member

@rh-atomic-bot r+ d74edce

@rh-atomic-bot
Copy link

⌛ Testing commit d74edce with merge 923e7bd...

rh-atomic-bot pushed a commit that referenced this pull request Mar 9, 2019
In Silverblue right now, the boot menu title looks like this:

    Fedora 29.20190301.0 (Workstation Edition) 29.20190301.0 (ostree)

This is because RPM-OSTree's `mutate-os-release` feature is enabled,
which injects the OSTree version string directly into `VERSION` and
`PRETTY_NAME`. So appending the version string again is a bit redundant.
Let's just do a simple substring check here before adding the version to
the title.

Closes: #1829
Approved by: cgwalters
@rh-atomic-bot
Copy link

💔 Test failed - status-atomicjenkins

@cgwalters
Copy link
Member

@rh-atomic-bot retry

@rh-atomic-bot
Copy link

⌛ Testing commit d74edce with merge 978cffe...

@rh-atomic-bot
Copy link

☀️ Test successful - status-atomicjenkins
Approved by: cgwalters
Pushing 978cffe to master...

@jlebon jlebon deleted the pr/pretty-title branch April 24, 2023 02:50
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.

None yet

3 participants