diff options
| author | Matthew Heon <mheon@redhat.com> | 2020-05-12 14:15:44 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-05-12 14:15:44 -0400 |
| commit | 440e97c2c06772e90aa3594d96027c05c2700c59 (patch) | |
| tree | 04f1fbfa11c0c2c35a7035bcdac6aa1e0189275a /contrib | |
| parent | 5b4e91db73a80f31f67b7c28832527e64b074b74 (diff) | |
| download | podman-440e97c2c06772e90aa3594d96027c05c2700c59.tar.gz podman-440e97c2c06772e90aa3594d96027c05c2700c59.tar.bz2 podman-440e97c2c06772e90aa3594d96027c05c2700c59.zip | |
Remove libpod.conf from repo
Now that we're shipping containers.conf, we don't want to provide
a libpod.conf anymore. This removes libpod.conf from the repo and
as many direct uses as I can find.
There are a few more mentions in the documentation, but someone
more familiar with containers.conf should make those edits.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/container_test.sh | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 1 | ||||
| -rw-r--r-- | contrib/cirrus/lib.sh | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 4 |
5 files changed, 0 insertions, 13 deletions
diff --git a/contrib/cirrus/container_test.sh b/contrib/cirrus/container_test.sh index 4624868f1..bf0a0d3f1 100644 --- a/contrib/cirrus/container_test.sh +++ b/contrib/cirrus/container_test.sh @@ -126,7 +126,6 @@ if [ $install -eq 1 ]; then make TAGS="${TAGS}" install.bin PREFIX=/usr ETCDIR=/etc make TAGS="${TAGS}" install.man PREFIX=/usr ETCDIR=/etc make TAGS="${TAGS}" install.cni PREFIX=/usr ETCDIR=/etc - make TAGS="${TAGS}" install.config PREFIX=/usr ETCDIR=/etc make TAGS="${TAGS}" install.systemd PREFIX=/usr ETCDIR=/etc fi diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index 6341bcb4a..0f2b2ab7e 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -50,7 +50,6 @@ case "$SPECIALMODE" in none) make make install PREFIX=/usr ETCDIR=/etc - make install.config PREFIX=/usr make test-binaries if [[ "$TEST_REMOTE_CLIENT" == "true" ]] then diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 750aec3b6..c0dd8cfc5 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -98,7 +98,6 @@ ROOTLESS_ENV_RE='(CIRRUS_.+)|(ROOTLESS_.+)|(.+_IMAGE.*)|(.+_BASE)|(.*DIRPATH)|(. SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(GC[EP]..+)|(SSH)' SPECIALMODE="${SPECIALMODE:-none}" -MOD_LIBPOD_CONF="${MOD_LIBPOD_CONF:false}" TEST_REMOTE_CLIENT="${TEST_REMOTE_CLIENT:-false}" export CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-podman} diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 756240444..945b33909 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -76,12 +76,6 @@ case "$CG_FS_TYPE" in X=$(echo "export OCI_RUNTIME=/usr/bin/crun" | \ tee -a /etc/environment) && eval "$X" && echo "$X" - if [[ "$MOD_LIBPOD_CONF" == "true" ]]; then - warn "Updating runtime setting in repo. copy of libpod.conf" - sed -i -r -e 's/^runtime = "runc"/runtime = "crun"/' $GOSRC/libpod.conf - git diff $GOSRC/libpod.conf - fi - if [[ "$OS_RELEASE_ID" == "fedora" ]]; then warn "Upgrading to the latest crun" # Normally not something to do for stable testing diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 1dfbdf208..ff948701b 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -423,10 +423,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build mv pkg/hooks/README.md pkg/hooks/README-hooks.md -# install libpod.conf -install -dp %{buildroot}%{_datadir}/containers -install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers - # install conmon install -dp %{buildroot}%{_libexecdir}/%{name} install -p -m 755 conmon/bin/conmon %{buildroot}%{_libexecdir}/%{name} |