mirror of https://github.com/containers/podman.git
Merge cc4e5f2d00
into dfd205fa24
This commit is contained in:
commit
92af652097
|
@ -132,6 +132,10 @@ function setup() {
|
||||||
|
|
||||||
# bats test_tags=ci:parallel
|
# bats test_tags=ci:parallel
|
||||||
@test "podman checkpoint --export, with volumes" {
|
@test "podman checkpoint --export, with volumes" {
|
||||||
|
if [[ -n "$HOST_DISTRO_NAME" && "$HOST_DISTRO_NAME" == "fedora" ]] && [[ -n "$HOST_DISTRO_RELEASE" && "$HOST_DISTRO_RELEASE" == "43" ]]; then
|
||||||
|
skip "Broken on Fedora 43: https://github.com/containers/crun/issues/1770"
|
||||||
|
fi
|
||||||
|
|
||||||
skip_if_remote "Test uses --root/--runroot, which are N/A over remote"
|
skip_if_remote "Test uses --root/--runroot, which are N/A over remote"
|
||||||
|
|
||||||
local p_opts="$(podman_isolation_opts ${PODMAN_TMPDIR}) --events-backend file"
|
local p_opts="$(podman_isolation_opts ${PODMAN_TMPDIR}) --events-backend file"
|
||||||
|
|
|
@ -41,6 +41,16 @@ if [ $(id -u) -eq 0 ]; then
|
||||||
_LOG_PROMPT='#'
|
_LOG_PROMPT='#'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -f /etc/os-release ]]; then
|
||||||
|
source /etc/os-release
|
||||||
|
if [[ -n "$ID" ]]; then
|
||||||
|
export HOST_DISTRO_NAME="$ID"
|
||||||
|
fi
|
||||||
|
if [[ -n "$VERSION_ID" ]]; then
|
||||||
|
export HOST_DISTRO_RELEASE="$VERSION_ID"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Invocations via su may not set this. Although all container tools make
|
# Invocations via su may not set this. Although all container tools make
|
||||||
# an effort to determine a default if unset, there are corner cases (rootless
|
# an effort to determine a default if unset, there are corner cases (rootless
|
||||||
# namespace preservation) that run before the default is set.
|
# namespace preservation) that run before the default is set.
|
||||||
|
|
|
@ -4,6 +4,8 @@ set -exo pipefail
|
||||||
|
|
||||||
uname -r
|
uname -r
|
||||||
|
|
||||||
|
cat /etc/os-release
|
||||||
|
|
||||||
loginctl enable-linger "$ROOTLESS_USER"
|
loginctl enable-linger "$ROOTLESS_USER"
|
||||||
|
|
||||||
rpm -q \
|
rpm -q \
|
||||||
|
|
Loading…
Reference in New Issue