From 6eb5801723b3659d0b30e4ab8c62345328c0af87 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 15 Dec 2020 17:21:34 +0100
Subject: [PATCH] pkg, cli: rootless uses correct isolation

when running as rootless, make sure the cli default isolation is set
to "rootless" instead of "oci".

Closes: https://github.com/containers/buildah/issues/2750

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 pkg/cli/common.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/cli/common.go b/pkg/cli/common.go
index 123548d97bc..1e2db58c4e5 100644
--- a/pkg/cli/common.go
+++ b/pkg/cli/common.go
@@ -17,6 +17,7 @@ import (
 	"github.com/containers/common/pkg/auth"
 	commonComp "github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/config"
+	"github.com/containers/storage/pkg/unshare"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
@@ -366,6 +367,9 @@ func DefaultIsolation() string {
 	if isolation != "" {
 		return isolation
 	}
+	if unshare.IsRootless() {
+		return "rootless"
+	}
 	return buildah.OCI
 }