diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-14 17:59:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 17:59:12 +0200 |
| commit | 210f1040d26334457803bc1da74667f70630a620 (patch) | |
| tree | bd2c5c93236b1ba4a9e9af85df33223a49bbff76 /contrib | |
| parent | 3d3359086ef0ed0833a8ac8e9d06d9934d835139 (diff) | |
| parent | 99cc07670099cbfa4bfc2dc7b24b39b254bc9561 (diff) | |
| download | podman-210f1040d26334457803bc1da74667f70630a620.tar.gz podman-210f1040d26334457803bc1da74667f70630a620.tar.bz2 podman-210f1040d26334457803bc1da74667f70630a620.zip | |
Merge pull request #6952 from baude/systemdpid1fix
add systemd to fedora image
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/lib.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 66e8060cf..2375d512e 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -392,7 +392,6 @@ install_test_configs() { # as the default). This config prevents allocation of network address space used # by default in google cloud. https://cloud.google.com/vpc/docs/vpc#ip-ranges install -v -D -m 644 $SCRIPT_BASE/99-do-not-use-google-subnets.conflist /etc/cni/net.d/ - install -v -D -m 644 ./test/policy.json /etc/containers/ install -v -D -m 644 ./test/registries.conf /etc/containers/ } |