diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-16 15:52:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-16 15:52:25 +0000 |
commit | bacb2fc526dba7214e3c8420eccc5cf22bbb1a29 (patch) | |
tree | 1e0e5dc8f71cacb030cd001734957c87b5370380 /contrib/cirrus/logcollector.sh | |
parent | 978c0767fa72abfa41f720f6fab34a62e3ac7a12 (diff) | |
parent | f66ecc882df822260e41de24b1c5f44a1ba3c3ad (diff) | |
download | podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.tar.gz podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.tar.bz2 podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.zip |
Merge pull request #8312 from cevich/new_ubuntu_images
Cirrus: Update VM Images; Both Fedora and Ubuntu "prior" flavors run with CGroupsV1 & runc
Diffstat (limited to 'contrib/cirrus/logcollector.sh')
-rwxr-xr-x | contrib/cirrus/logcollector.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh index 7bf651b36..323015cef 100755 --- a/contrib/cirrus/logcollector.sh +++ b/contrib/cirrus/logcollector.sh @@ -53,7 +53,7 @@ case $1 in slirp4netns \ ) case $OS_RELEASE_ID in - fedora*) + fedora) cat /etc/fedora-release PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n' PKG_NAMES+=(\ @@ -61,7 +61,7 @@ case $1 in libseccomp \ ) ;; - ubuntu*) + ubuntu) cat /etc/issue PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n' PKG_NAMES+=(\ |