mirror of
https://github.com/containers/podman.git
synced 2025-06-22 18:08:11 +08:00
Fix: unpause not supported for CGv1 rootless
Thanks Ed Santiago <santiago@redhat.com> for the fix. Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
@ -8,6 +8,17 @@
|
|||||||
|
|
||||||
load helpers
|
load helpers
|
||||||
|
|
||||||
|
# Returns true if we are able to podman-pause
|
||||||
|
function _can_pause() {
|
||||||
|
# Even though we're just trying completion, not an actual unpause,
|
||||||
|
# podman barfs with:
|
||||||
|
# Error: unpause is not supported for cgroupv1 rootless containers
|
||||||
|
if is_rootless && is_cgroupsv1; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
function check_shell_completion() {
|
function check_shell_completion() {
|
||||||
local count=0
|
local count=0
|
||||||
|
|
||||||
@ -70,8 +81,13 @@ function check_shell_completion() {
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
*CONTAINER*)
|
*CONTAINER*)
|
||||||
|
# podman unpause fails early on rootless cgroupsv1
|
||||||
|
if [[ $cmd = "unpause" ]] && ! _can_pause; then
|
||||||
|
continue 2
|
||||||
|
fi
|
||||||
|
|
||||||
run_completion "$@" $cmd "${extra_args[@]}" ""
|
run_completion "$@" $cmd "${extra_args[@]}" ""
|
||||||
is "$output" ".*-$random_container_name${nl}" "Found expected container in suggestions"
|
is "$output" ".*-$random_container_name${nl}" "Found expected container in suggestions for '$cmd'"
|
||||||
|
|
||||||
match=true
|
match=true
|
||||||
# resume
|
# resume
|
||||||
@ -212,7 +228,9 @@ function _check_completion_end() {
|
|||||||
run_podman create --name created-$random_container_name $IMAGE
|
run_podman create --name created-$random_container_name $IMAGE
|
||||||
run_podman run --name running-$random_container_name -d $IMAGE top
|
run_podman run --name running-$random_container_name -d $IMAGE top
|
||||||
run_podman run --name pause-$random_container_name -d $IMAGE top
|
run_podman run --name pause-$random_container_name -d $IMAGE top
|
||||||
run_podman pause pause-$random_container_name
|
if _can_pause; then
|
||||||
|
run_podman pause pause-$random_container_name
|
||||||
|
fi
|
||||||
run_podman run --name exited-$random_container_name -d $IMAGE echo exited
|
run_podman run --name exited-$random_container_name -d $IMAGE echo exited
|
||||||
|
|
||||||
# create pods for each state
|
# create pods for each state
|
||||||
|
Reference in New Issue
Block a user