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

Improved Windows compatibility

Browse Source 
Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
This commit is contained in:
Arthur Sengileyev
2022-08-16 13:39:02 +03:00
parent d97f4dfbcc
commit f87f6d2fc1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/rootlessport/main.go
View File

@ -225,7 +225,7 @@ outer:
// https://github.com/containers/podman/issues/11248 // https://github.com/containers/podman/issues/11248
// Copy /dev/null to stdout and stderr to prevent SIGPIPE errors // Copy /dev/null to stdout and stderr to prevent SIGPIPE errors
if f, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755); err == nil { if f, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0755); err == nil {
unix.Dup2(int(f.Fd()), 1) //nolint:errcheck unix.Dup2(int(f.Fd()), 1) //nolint:errcheck
unix.Dup2(int(f.Fd()), 2) //nolint:errcheck unix.Dup2(int(f.Fd()), 2) //nolint:errcheck
f.Close() f.Close()

4
pkg/machine/pull.go
View File

@ -213,8 +213,8 @@ func decompressXZ(src string, output io.WriteCloser) error {
var read io.Reader var read io.Reader
var cmd *exec.Cmd var cmd *exec.Cmd
// Prefer xz utils for fastest performance, fallback to go xi2 impl // Prefer xz utils for fastest performance, fallback to go xi2 impl
if _, err := exec.LookPath("xzcat"); err == nil { if _, err := exec.LookPath("xz"); err == nil {
cmd = exec.Command("xzcat", "-k", src) cmd = exec.Command("xz", "-d", "-c", "-k", src)
read, err = cmd.StdoutPipe() read, err = cmd.StdoutPipe()
if err != nil { if err != nil {
return err return err

8
pkg/machine/qemu/machine.go
View File

@ -545,12 +545,12 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
return err return err
} }
defer fd.Close() defer fd.Close()
dnr, err := os.OpenFile("/dev/null", os.O_RDONLY, 0755) dnr, err := os.OpenFile(os.DevNull, os.O_RDONLY, 0755)
if err != nil { if err != nil {
return err return err
} }
defer dnr.Close() defer dnr.Close()
dnw, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755) dnw, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0755)
if err != nil { if err != nil {
return err return err
} }
@ -1216,11 +1216,11 @@ func (v *MachineVM) startHostNetworking() (string, apiForwardingState, error) {
} }
attr := new(os.ProcAttr) attr := new(os.ProcAttr)
dnr, err := os.OpenFile("/dev/null", os.O_RDONLY, 0755) dnr, err := os.OpenFile(os.DevNull, os.O_RDONLY, 0755)
if err != nil { if err != nil {
return "", noForwarding, err return "", noForwarding, err
} }
dnw, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755) dnw, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0755)
if err != nil { if err != nil {
return "", noForwarding, err return "", noForwarding, err
} }