@@ -1119,7 +1119,7 @@ func (container *Container) releaseNetwork() {

 	container.NetworkSettings = &NetworkSettings{}

 }

-// FIXME: replace this with a control socket within docker-init

+// FIXME: replace this with a control socket within dockerinit

 func (container *Container) waitLxc() error {

 	for {

 		output, err := exec.Command("lxc-info", "-n", container.ID).CombinedOutput()

deleted file mode 100644

@@ -1,16 +0,0 @@

-package main

-

-import (

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

-)

-

-var (

-	GITCOMMIT string

-	VERSION   string

-)

-

-func main() {

-	// Running in init mode

-	sysinit.SysInit()

-	return

-}

new file mode 100644

@@ -0,0 +1,16 @@

+package main

+

+import (

+	"github.com/dotcloud/docker/sysinit"

+)

+

+var (

+	GITCOMMIT string

+	VERSION   string

+)

+

+func main() {

+	// Running in init mode

+	sysinit.SysInit()

+	return

+}

@@ -94,7 +94,7 @@ lxc.mount.entry = devpts {{$ROOTFS}}/dev/pts devpts newinstance,ptmxmode=0666,no

 #lxc.mount.entry = varlock {{$ROOTFS}}/var/lock tmpfs size=1024k,nosuid,nodev,noexec 0 0

 lxc.mount.entry = shm {{$ROOTFS}}/dev/shm tmpfs size=65536k,nosuid,nodev,noexec 0 0

-# Inject docker-init

+# Inject dockerinit

 lxc.mount.entry = {{.SysInitPath}} {{$ROOTFS}}/.dockerinit none bind,ro 0 0

 # In order to get a working DNS environment, mount bind (ro) the host's /etc/resolv.conf into the container

@@ -97,7 +97,7 @@ func executeProgram(name string, args []string) {

 // up the environment before running the actual process

 func SysInit() {

 	if len(os.Args) <= 1 {

-		fmt.Println("You should not invoke docker-init manually")

+		fmt.Println("You should not invoke dockerinit manually")

 		os.Exit(1)

 	}

 	var u = flag.String("u", "", "username or uid")