diff options
| author | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2021-09-13 22:00:12 +0200 |
|---|---|---|
| committer | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2021-09-14 17:44:42 +0200 |
| commit | 38c5f6721f9aa2dc2aea751c2e22afd4d9e370b5 (patch) | |
| tree | c3e06f6d81c052a6b17262bb4cb73fc92ead449d | |
| parent | 20daae1de93c1a73f454f3f3ba04bba03a348f81 (diff) | |
| download | podman-38c5f6721f9aa2dc2aea751c2e22afd4d9e370b5.tar.gz podman-38c5f6721f9aa2dc2aea751c2e22afd4d9e370b5.tar.bz2 podman-38c5f6721f9aa2dc2aea751c2e22afd4d9e370b5.zip | |
Show variant and codename of the distribution
Along with the name (id) and the version(_id)
But only show the information if is available
Examples: Fedora CoreOS, Ubuntu Focal
[NO TESTS NEEDED]
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
| -rw-r--r-- | docs/source/markdown/podman-info.1.md | 1 | ||||
| -rw-r--r-- | libpod/define/info.go | 2 | ||||
| -rw-r--r-- | libpod/info.go | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/docs/source/markdown/podman-info.1.md b/docs/source/markdown/podman-info.1.md index 7127f9026..21ca35eef 100644 --- a/docs/source/markdown/podman-info.1.md +++ b/docs/source/markdown/podman-info.1.md @@ -42,6 +42,7 @@ host: cpus: 8 distribution: distribution: fedora + variant: workstation version: "34" eventLogger: journald hostname: localhost.localdomain diff --git a/libpod/define/info.go b/libpod/define/info.go index 73df80087..f4aa0031c 100644 --- a/libpod/define/info.go +++ b/libpod/define/info.go @@ -78,7 +78,9 @@ type IDMappings struct { // for libpod type DistributionInfo struct { Distribution string `json:"distribution"` + Variant string `json:"variant,omitempty"` Version string `json:"version"` + Codename string `json:"codename,omitempty"` } // ConmonInfo describes the conmon executable being used diff --git a/libpod/info.go b/libpod/info.go index 31ec9cdc1..2eba4bbff 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -370,9 +370,15 @@ func (r *Runtime) GetHostDistributionInfo() define.DistributionInfo { if strings.HasPrefix(l.Text(), "ID=") { dist.Distribution = strings.TrimPrefix(l.Text(), "ID=") } + if strings.HasPrefix(l.Text(), "VARIANT_ID=") { + dist.Variant = strings.Trim(strings.TrimPrefix(l.Text(), "VARIANT_ID="), "\"") + } if strings.HasPrefix(l.Text(), "VERSION_ID=") { dist.Version = strings.Trim(strings.TrimPrefix(l.Text(), "VERSION_ID="), "\"") } + if strings.HasPrefix(l.Text(), "VERSION_CODENAME=") { + dist.Codename = strings.Trim(strings.TrimPrefix(l.Text(), "VERSION_CODENAME="), "\"") + } } return dist } |