From 25befedfd0d8d0a978c77e2e963be8997ae714d2 Mon Sep 17 00:00:00 2001 From: 89luca89 Date: Sun, 2 Jan 2022 16:06:20 +0100 Subject: [PATCH] Fix check for container_manager when using verbose or remote --- distrobox-create | 2 +- distrobox-enter | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distrobox-create b/distrobox-create index 99d5289837..e3dee39d76 100755 --- a/distrobox-create +++ b/distrobox-create @@ -315,7 +315,7 @@ generate_command() { # These flags are not supported by docker, so we use them only if our # container manager is podman. - if [ "${container_manager}" = "podman" ]; then + if [ "${container_manager#*podman*}" ]; then result_command="${result_command} --userns keep-id --ulimit host diff --git a/distrobox-enter b/distrobox-enter index 98d55f073a..43c87c60c5 100755 --- a/distrobox-enter +++ b/distrobox-enter @@ -134,7 +134,7 @@ fi # # This is not necessary on docker as it is already handled # in this way. -if [ "${container_manager}" = "podman" ] && +if [ "${container_manager#*podman*}" ] && [ -S "/run/user/$(id -ru)/podman/podman.sock" ] && systemctl --user status podman.socket >/dev/null; then