2 files changed, 9 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
index 716db81dc..d3e43e44d 100644
--- a/pkg/rootless/rootless_linux.c
+++ b/pkg/rootless/rootless_linux.c
@@ -210,6 +210,14 @@ can_use_shortcut ()
           ret = false;
           break;
         }
+
+      if (argv[argc+1] != NULL && (strcmp (argv[argc], "container") == 0 ||
+	   strcmp (argv[argc], "image") == 0) &&
+	   strcmp (argv[argc+1], "mount") == 0)
+        {
+          ret = false;
+          break;
+        }
     }
 
   free (argv[0]);
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index 2e580347d..b1f200cc2 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -16,7 +16,7 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/containers/libpod/v2/pkg/errorhandling"
+	"github.com/containers/podman/v2/pkg/errorhandling"
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"