Merge pull request #3202 from jpoimboe/libvirt-prereq-env

dockerinit: propagate "container" env variable from lxc
Upstream-commit: 5d817767146b68194003eeab1ac2ec540d3503bf
Component: engine

components/engine/container.go

@@ -586,7 +586,6 @@ func (container *Container) Start() (err error) {
 	env := []string{
 		"HOME=/",
 		"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-		"container=lxc",
 		"HOSTNAME=" + container.Config.Hostname,
 	}
 

components/engine/sysinit/sysinit.go

@@ -191,6 +191,9 @@ func SysInit() {
 		log.Fatalf("Unable to unmarshal environment variables: %v", err)
 	}
 
+	// Propagate the plugin-specific container env variable
+	env = append(env, "container="+os.Getenv("container"))
+
 	args := &DockerInitArgs{
 		user:       *user,
 		gateway:    *gateway,