diff options
| author | Jonathan Lebon <jonathan@jlebon.com> | 2019-03-01 09:16:55 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-03-09 19:44:15 +0000 |
| commit | 978cffed70640cca66cb1623dea68b179288b453 (patch) | |
| tree | fe1daa95f4bd529b05c128ccb20061b121742ca7 /src/libostree/ostree-sysroot-deploy.c | |
| parent | 21ebc7d21edd00c3fe0ce80ea68ba3f8f5e41ae3 (diff) | |
| download | ostree-978cffed70640cca66cb1623dea68b179288b453.tar.gz | |
lib/deploy: Don't include version twice in bootmenu 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.
Closes: #1829
Approved by: cgwalters
Diffstat (limited to 'src/libostree/ostree-sysroot-deploy.c')
| -rw-r--r-- | src/libostree/ostree-sysroot-deploy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index ec9d1592..d37861b7 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -1739,7 +1739,7 @@ install_deployment_kernel (OstreeSysroot *sysroot, * (specifically, it looks for the substring "(ostree"), so further * changes to the title format may require updating that backend. */ g_autoptr(GString) title_key = g_string_new (val); - if (deployment_version && *deployment_version) + if (deployment_version && *deployment_version && !strstr (val, deployment_version)) { g_string_append_c (title_key, ' '); g_string_append (title_key, deployment_version); |