Small fixes to type names

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby
2014-01-17 17:42:22 -08:00
parent 889b4b10ae
commit ca8dd73fbf
5 changed files with 24 additions and 23 deletions
+4 -4
View File
@@ -12,7 +12,7 @@ import (
)
// Clear environment pollution introduced by lxc-start
func setupEnv(args *execdriver.DockerInitArgs) {
func setupEnv(args *execdriver.InitArgs) {
os.Clearenv()
for _, kv := range args.Env {
parts := strings.SplitN(kv, "=", 2)
@@ -23,9 +23,9 @@ func setupEnv(args *execdriver.DockerInitArgs) {
}
}
func executeProgram(args *execdriver.DockerInitArgs) error {
func executeProgram(args *execdriver.InitArgs) error {
setupEnv(args)
dockerInitFct, err := execdriver.GetDockerInitFct(args.Driver)
dockerInitFct, err := execdriver.GetInitFunc(args.Driver)
if err != nil {
panic(err)
}
@@ -71,7 +71,7 @@ func SysInit() {
// Propagate the plugin-specific container env variable
env = append(env, "container="+os.Getenv("container"))
args := &execdriver.DockerInitArgs{
args := &execdriver.InitArgs{
User: *user,
Gateway: *gateway,
Ip: *ip,