opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 03:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

unshare: use rootless from libpod

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-05-16 15:55:48 +02:00
parent 2bb1487a00
commit 4b48024057
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/podman/unshare.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"github.com/containers/buildah/pkg/unshare" "github.com/containers/libpod/pkg/rootless"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -30,9 +30,13 @@ func init() {
flags.SetInterspersed(false) flags.SetInterspersed(false)
} }
func unshareEnv() []string {
return append(os.Environ(), "_CONTAINERS_USERNS_CONFIGURED=done")
}
// unshareCmd execs whatever using the ID mappings that we want to use for ourselves // unshareCmd execs whatever using the ID mappings that we want to use for ourselves
func unshareCmd(c *cobra.Command, args []string) error { func unshareCmd(c *cobra.Command, args []string) error {
if isRootless := unshare.IsRootless(); !isRootless { if isRootless := rootless.IsRootless(); !isRootless {
return errors.Errorf("please use unshare with rootless") return errors.Errorf("please use unshare with rootless")
} }
// exec the specified command, if there is one // exec the specified command, if there is one
@ -45,10 +49,9 @@ func unshareCmd(c *cobra.Command, args []string) error {
args = []string{shell} args = []string{shell}
} }
cmd := exec.Command(args[0], args[1:]...) cmd := exec.Command(args[0], args[1:]...)
cmd.Env = unshare.RootlessEnv() cmd.Env = unshareEnv()
cmd.Stdin = os.Stdin cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
unshare.ExecRunnable(cmd) return cmd.Run()
return nil
} }