Skip to content

Commit

Permalink
Fix check for container_manager when using verbose or remote
Browse files Browse the repository at this point in the history
  • Loading branch information
89luca89 committed Jan 2, 2022
1 parent 25befed commit 71e30db
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion distrobox-create
Original file line number Diff line number Diff line change
Expand Up @@ -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 [ -z "${container_manager#*podman*}" ]; then
result_command="${result_command}
--userns keep-id
--ulimit host
Expand Down
2 changes: 1 addition & 1 deletion distrobox-enter
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ fi
#
# This is not necessary on docker as it is already handled
# in this way.
if [ "${container_manager#*podman*}" ] &&
if [ -z "${container_manager#*podman*}" ] &&
[ -S "/run/user/$(id -ru)/podman/podman.sock" ] &&
systemctl --user status podman.socket >/dev/null; then

Expand Down

0 comments on commit 71e30db

Please sign in to comment.