From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Thu, 27 Jan 2011 23:14:51 +0000 (+0100)
Subject: export env variable in lxc_start
X-Git-Tag: lxc-0.7.4-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3244e75040a98d2854144ebc169a5a61ddbe0a26;p=thirdparty%2Flxc.git

export env variable in lxc_start

Let's export the 'container' variable and let init receive it
as a kernel command line option.

In the upstart init scripts, we can distinguish if we are in a
container context or not.

===============================================================================

# /dev/console - getty
#
# This service maintains a getty on /dev/console from the point the
# system is started until it is shut down again.
# It only runs in lxc containers.

start on stopped rc RUNLEVEL=[2345]
stop on runlevel [!2345]

env container
pre-start script
	[ "x$container" != "xlxc" ] && { stop; exit 0; }
	exit 0;
end script

respawn

exec /sbin/getty -8 38400 /dev/console

===============================================================================

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index 661764a4b..4f3d964a8 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -117,6 +117,11 @@ int main(int argc, char *argv[])
 			 my_args.progname, my_args.quiet))
 		return err;
 
+	if (putenv("container=lxc")) {
+		SYSERROR("failed to set environment variable");
+		return err;
+	}
+
 	/* rcfile is specified in the cli option */
 	if (my_args.rcfile)
 		rcfile = (char *)my_args.rcfile;