Skip to content

Commit

Permalink
debuig
Browse files Browse the repository at this point in the history
  • Loading branch information
avagin committed Dec 6, 2023
1 parent af6e9ae commit 35e2bab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions scripts/ci/prepare-for-fedora-rawhide.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dnf install -y \
libnet-devel \
libnl3-devel \
libbsd-devel \
libselinux-utils \
make \
procps-ng \
protobuf-c-devel \
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/run-ci-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,14 @@ if capsh --supports=cap_checkpoint_restore && unshare -c /bin/true; then
if [ -d /sys/fs/selinux ]; then
# Note: selinux in Enforcing mode prevents us from calling clone3() or writing to ns_last_pid on restore; hence set to Permissive for the test and then set back.
selinuxmode=$(getenforce)
setenforce Permissive
setenforce Permissive || true
fi
# Run it as non-root in a user namespace. Since CAP_CHECKPOINT_RESTORE behaves differently in non-user namespaces (e.g. no access to map_files) this tests that we can dump and restore
# under those conditions. Note that the "... && true" part is necessary; we need at least one statement after the tests so that bash can reap zombies in the user namespace,
# otherwise it will exec the last statement and get replaced and nobody will be left to reap our zombies.
sudo --user=#65534 --group=#65534 unshare -Ucfpm --mount-proc -- bash -c "./test/zdtm.py run -t zdtm/static/maps00 -f h --rootless && true"
if [ -d /sys/fs/selinux ]; then
setenforce "$selinuxmode"
setenforce "$selinuxmode" || true
fi
setcap -r criu/criu
else
Expand Down
1 change: 1 addition & 0 deletions scripts/ci/vagrant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ fedora-no-vdso() {
}

fedora-rawhide() {
ssh default sudo grubby --update-kernel ALL --args="selinux=0"
# The 6.2 kernel of Fedora 38 in combination with rawhide userspace breaks
# zdtm/static/socket-tcp-nfconntrack. To activate the new kernel previously
# installed this reboots the VM.
Expand Down

0 comments on commit 35e2bab

Please sign in to comment.