diff options
| author | Naveen <172697+naveensrinivasan@users.noreply.github.com> | 2022-04-02 16:29:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-02 16:29:37 -0500 |
| commit | 6375a85055b4472846445a37464851429edfa447 (patch) | |
| tree | a296f777fa928beaa40c6e9731d4df161d08d91e /test/upgrade/test-upgrade.bats | |
| parent | 9cacc18c951d4497b5979f96d829c86ca41f777f (diff) | |
| parent | d4394ea3688ad1942b8457f6df869f7c440d49e7 (diff) | |
| download | podman-6375a85055b4472846445a37464851429edfa447.tar.gz podman-6375a85055b4472846445a37464851429edfa447.tar.bz2 podman-6375a85055b4472846445a37464851429edfa447.zip | |
Merge branch 'containers:main' into naveen/feat/set-perms-actions
Diffstat (limited to 'test/upgrade/test-upgrade.bats')
| -rw-r--r-- | test/upgrade/test-upgrade.bats | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/test/upgrade/test-upgrade.bats b/test/upgrade/test-upgrade.bats index 063f4d624..198d8a169 100644 --- a/test/upgrade/test-upgrade.bats +++ b/test/upgrade/test-upgrade.bats @@ -75,6 +75,16 @@ setup() { cat >| $pmscript <<EOF #!/bin/bash +# +# Argh! podman >= 3.4 something something namespace something, fails with +# Error: invalid config provided: cannot set hostname when running in the host UTS namespace: invalid configuration +# +# https://github.com/containers/podman/issues/11969#issuecomment-943386484 +# +if grep -q utsns /etc/containers/containers.conf; then + sed -i -e '/^\utsns=/d' /etc/containers/containers.conf +fi + # events-backend=journald does not work inside a container opts="--events-backend=file $_PODMAN_TEST_OPTS" |