equal
deleted
inserted
replaced
1 From 3cf1310ac1de1c3ed1be6341d5d8e6afe255c89f Mon Sep 17 00:00:00 2001 |
1 From 2807410f20afedbe7e2a0df0147ba5ac280c0d4a Mon Sep 17 00:00:00 2001 |
2 From: Amit Krishnan <[email protected]> |
2 From: Shreya Jain <[email protected]> |
3 Date: Thu, 6 Oct 2016 14:24:52 -0700 |
3 Date: Mon, 10 Oct 2016 12:31:58 -0700 |
4 Subject: [PATCH] Solaris-v1.10.3 |
4 Subject: [PATCH] Solaris-v1.10.3 |
5 |
5 |
6 --- |
6 --- |
7 Dockerfile.solaris | 26 + |
7 Dockerfile.solaris | 26 + |
8 Makefile | 35 +- |
8 Makefile | 35 +- |
3289 +func NewDriver(options []string, root, libPath string, sysInfo *sysinfo.SysInfo) (execdriver.Driver, error) { |
3289 +func NewDriver(options []string, root, libPath string, sysInfo *sysinfo.SysInfo) (execdriver.Driver, error) { |
3290 + return zones.NewDriver(root, options) |
3290 + return zones.NewDriver(root, options) |
3291 +} |
3291 +} |
3292 diff --git a/daemon/execdriver/zones/driver.go b/daemon/execdriver/zones/driver.go |
3292 diff --git a/daemon/execdriver/zones/driver.go b/daemon/execdriver/zones/driver.go |
3293 new file mode 100644 |
3293 new file mode 100644 |
3294 index 0000000..de5b637 |
3294 index 0000000..4a65eca |
3295 --- /dev/null |
3295 --- /dev/null |
3296 +++ b/daemon/execdriver/zones/driver.go |
3296 +++ b/daemon/execdriver/zones/driver.go |
3297 @@ -0,0 +1,745 @@ |
3297 @@ -0,0 +1,745 @@ |
3298 +// +build solaris,cgo |
3298 +// +build solaris,cgo |
3299 + |
3299 + |
3596 + fileJson, _ := json.Marshal(processconfig) |
3596 + fileJson, _ := json.Marshal(processconfig) |
3597 + if err := ioutil.WriteFile(ProcessPath, fileJson, 0644); err != nil { |
3597 + if err := ioutil.WriteFile(ProcessPath, fileJson, 0644); err != nil { |
3598 + return -1, err |
3598 + return -1, err |
3599 + } |
3599 + } |
3600 + |
3600 + |
3601 + cmd := exec.Command(RUNZ, "exec", c.Name, ProcessPath) |
3601 + cmd := exec.Command(RUNZ, "exec", "-p", ProcessPath, c.Name) |
3602 + cmd.Dir = filepath.Dir(filepath.Dir(c.Rootfs)) |
3602 + cmd.Dir = filepath.Dir(filepath.Dir(c.Rootfs)) |
3603 + cmd.Stdout = pipes.Stdout |
3603 + cmd.Stdout = pipes.Stdout |
3604 + cmd.Stderr = pipes.Stderr |
3604 + cmd.Stderr = pipes.Stderr |
3605 + r, w, err := os.Pipe() |
3605 + r, w, err := os.Pipe() |
3606 + if err != nil { |
3606 + if err != nil { |