diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-01 19:41:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 19:41:46 +0200 |
| commit | cbffdddce6d741eac4f3efa132016aba99683500 (patch) | |
| tree | 927b74764e93a47aae61597100502acbe17f1afd /pkg/machine/qemu/options_linux.go | |
| parent | 7a52440a6d7fe7ac1ddccf9fe7247d7abca8ecce (diff) | |
| parent | 7ef3981abe2412727840a2886489a08c03a05299 (diff) | |
| download | podman-cbffdddce6d741eac4f3efa132016aba99683500.tar.gz podman-cbffdddce6d741eac4f3efa132016aba99683500.tar.bz2 podman-cbffdddce6d741eac4f3efa132016aba99683500.zip | |
Merge pull request #10488 from baude/machinehostnetwork
Enable port forwarding on host
Diffstat (limited to 'pkg/machine/qemu/options_linux.go')
| -rw-r--r-- | pkg/machine/qemu/options_linux.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg/machine/qemu/options_linux.go b/pkg/machine/qemu/options_linux.go index 0a2e40d8f..c73a68cc6 100644 --- a/pkg/machine/qemu/options_linux.go +++ b/pkg/machine/qemu/options_linux.go @@ -1,7 +1,13 @@ package qemu -import "github.com/containers/podman/v3/pkg/util" +import ( + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/util" +) -func getSocketDir() (string, error) { +func getRuntimeDir() (string, error) { + if !rootless.IsRootless() { + return "/run", nil + } return util.GetRuntimeDir() } |