deleted file mode 100644

@@ -1,101 +0,0 @@

-package chroot

-

-import (

-	"fmt"

-	"github.com/dotcloud/docker/execdriver"

-	"github.com/dotcloud/docker/pkg/mount"

-	"os"

-	"os/exec"

-	"syscall"

-)

-

-const (

-	DriverName = "chroot"

-	Version    = "0.1"

-)

-

-func init() {

-	execdriver.RegisterInitFunc(DriverName, func(args *execdriver.InitArgs) error {

-		if err := mount.ForceMount("proc", "proc", "proc", ""); err != nil {

-			return err

-		}

-		defer mount.ForceUnmount("proc")

-		cmd := exec.Command(args.Args[0], args.Args[1:]...)

-

-		cmd.Stderr = os.Stderr

-		cmd.Stdout = os.Stdout

-		cmd.Stdin = os.Stdin

-

-		return cmd.Run()

-	})

-}

-

-type driver struct {

-}

-

-func NewDriver() (*driver, error) {

-	return &driver{}, nil

-}

-

-func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (int, error) {

-	params := []string{

-		"chroot",

-		c.Rootfs,

-		"/.dockerinit",

-		"-driver",

-		DriverName,

-	}

-	params = append(params, c.Entrypoint)

-	params = append(params, c.Arguments...)

-

-	var (

-		name = params[0]

-		arg  = params[1:]

-	)

-	aname, err := exec.LookPath(name)

-	if err != nil {

-		aname = name

-	}

-	c.Path = aname

-	c.Args = append([]string{name}, arg...)

-

-	if err := c.Start(); err != nil {

-		return -1, err

-	}

-

-	if startCallback != nil {

-		startCallback(c)

-	}

-

-	err = c.Wait()

-	return getExitCode(c), err

-}

-

-/// Return the exit code of the process

-// if the process has not exited -1 will be returned

-func getExitCode(c *execdriver.Command) int {

-	if c.ProcessState == nil {

-		return -1

-	}

-	return c.ProcessState.Sys().(syscall.WaitStatus).ExitStatus()

-}

-

-func (d *driver) Kill(p *execdriver.Command, sig int) error {

-	return p.Process.Kill()

-}

-

-func (d *driver) Restore(c *execdriver.Command) error {

-	panic("Not Implemented")

-}

-

-func (d *driver) Info(id string) execdriver.Info {

-	panic("Not implemented")

-}

-

-func (d *driver) Name() string {

-	return fmt.Sprintf("%s-%s", DriverName, Version)

-}

-

-func (d *driver) GetPidsForContainer(id string) ([]int, error) {

-	return nil, fmt.Errorf("Not supported")

-}

@@ -5,7 +5,6 @@ import (

 	"flag"

 	"fmt"

 	"github.com/dotcloud/docker/execdriver"

-	_ "github.com/dotcloud/docker/execdriver/chroot"

 	_ "github.com/dotcloud/docker/execdriver/lxc"

 	"io"

 	"io/ioutil"