diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-15 06:25:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 06:25:00 -0400 |
| commit | 4dd7bfdfaa3adf95af39fd45f74d49cea0c80064 (patch) | |
| tree | fb5ee1ff8173f95d11aff3c6be643ed467826cad | |
| parent | 10873c6f494fbc7a43365000f6f9702c21741077 (diff) | |
| parent | 38c5f6721f9aa2dc2aea751c2e22afd4d9e370b5 (diff) | |
| download | podman-4dd7bfdfaa3adf95af39fd45f74d49cea0c80064.tar.gz podman-4dd7bfdfaa3adf95af39fd45f74d49cea0c80064.tar.bz2 podman-4dd7bfdfaa3adf95af39fd45f74d49cea0c80064.zip | |
Merge pull request #11556 from afbjorklund/distribution-info
Show variant and codename of the distribution
| -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 } |