From f5b71e2e200fc57c462aa5d786d93b0cba301529 Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@crosbymichael.com>
Date: Sat, 22 Feb 2014 01:21:26 -0800
Subject: [PATCH] Refactor driver to use Exec function from nsini
 Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com>
 (github: crosbymichael)

---
 nsinit/state.go | 10 ++++++----
 nsinit/term.go  |  9 +++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/nsinit/state.go b/nsinit/state.go
index 1f0fedd1..2dbaaa59 100644
--- a/nsinit/state.go
+++ b/nsinit/state.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 )
 
 type StateWriter interface {
@@ -12,13 +13,14 @@ type StateWriter interface {
 }
 
 type DefaultStateWriter struct {
+	Root string
 }
 
 // writePidFile writes the namespaced processes pid to .nspid in the rootfs for the container
-func (*DefaultStateWriter) WritePid(pid int) error {
-	return ioutil.WriteFile(".nspid", []byte(fmt.Sprint(pid)), 0655)
+func (d *DefaultStateWriter) WritePid(pid int) error {
+	return ioutil.WriteFile(filepath.Join(d.Root, ".nspid"), []byte(fmt.Sprint(pid)), 0655)
 }
 
-func (*DefaultStateWriter) DeletePid() error {
-	return os.Remove(".nspid")
+func (d *DefaultStateWriter) DeletePid() error {
+	return os.Remove(filepath.Join(d.Root, ".nspid"))
 }
diff --git a/nsinit/term.go b/nsinit/term.go
index 64924689..58dccab2 100644
--- a/nsinit/term.go
+++ b/nsinit/term.go
@@ -11,6 +11,7 @@ type Terminal interface {
 	io.Closer
 	SetMaster(*os.File)
 	Attach(*exec.Cmd) error
+	Resize(h, w int) error
 }
 
 func NewTerminal(stdin io.Reader, stdout, stderr io.Writer, tty bool) Terminal {
@@ -35,6 +36,10 @@ type TtyTerminal struct {
 	state          *term.State
 }
 
+func (t *TtyTerminal) Resize(h, w int) error {
+	return term.SetWinsize(t.master.Fd(), &term.Winsize{Height: uint16(h), Width: uint16(w)})
+}
+
 func (t *TtyTerminal) SetMaster(master *os.File) {
 	t.master = master
 }
@@ -83,6 +88,10 @@ func (s *StdTerminal) Close() error {
 	return nil
 }
 
+func (s *StdTerminal) Resize(h, w int) error {
+	return nil
+}
+
 func (s *StdTerminal) Attach(command *exec.Cmd) error {
 	inPipe, err := command.StdinPipe()
 	if err != nil {