diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-08 11:30:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-08 11:30:24 -0700 |
| commit | 10cbaadf4ab1d2a644db79ed82e639c6ad279ba1 (patch) | |
| tree | 4aa6931d078a678c4f0efd8030c0f24543ae2d77 /contrib | |
| parent | c817ea1b33966c2f1f089b5c086df8cc45437065 (diff) | |
| parent | e18dfe69f51b0b620b18236cd07089905210369a (diff) | |
| download | podman-10cbaadf4ab1d2a644db79ed82e639c6ad279ba1.tar.gz podman-10cbaadf4ab1d2a644db79ed82e639c6ad279ba1.tar.bz2 podman-10cbaadf4ab1d2a644db79ed82e639c6ad279ba1.zip | |
Merge pull request #4189 from cevich/install_conmon
Cirrus: Install conmon in Fedora VMs
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/lib.sh | 4 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index fe4c25e73..94a94f70d 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -370,8 +370,8 @@ remove_packaged_podman_files() { # yum/dnf/dpkg may list system directories, only remove files $LISTING_CMD | while read fullpath do - # TODO: This can go away when conmon gets it's own package - if [[ -d "$fullpath" ]] || [[ $(basename "$fullpath") == "conmon" ]] ; then continue; fi + # Sub-directories may contain unrelated/valuable stuff + if [[ -d "$fullpath" ]]; then continue; fi ooe.sh sudo rm -vf "$fullpath" done diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 679ad3b8d..38b9e6860 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -31,6 +31,7 @@ ooe.sh sudo dnf install -y \ bridge-utils \ btrfs-progs-devel \ bzip2 \ + conmon \ container-selinux \ containernetworking-plugins \ containers-common \ |