From e8772943215fff3e17642ad410e4815e40e96b8b Mon Sep 17 00:00:00 2001
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Fri, 8 Nov 2013 16:15:11 -0600
Subject: [PATCH] dockerinit: propagate "container" env variable from lxc

Lxc (and libvirt) already set the "container" env variable
appropriately[1], so just use that.

[1] http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
---
 container.go       | 1 -
 sysinit/sysinit.go | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/container.go b/container.go
index 2307948e26..e2fb42c6fc 100644
--- a/container.go
+++ b/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,
 	}
 
diff --git a/sysinit/sysinit.go b/sysinit/sysinit.go
index 220f446d62..bc708b312a 100644
--- a/sysinit/sysinit.go
+++ b/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,