From fd795ad430a363fb90ba25fb25fcebfcb54d004d Mon Sep 17 00:00:00 2001
From: Sapan Bhatia <gwsapan@gmail.com>
Date: Thu, 6 Sep 2012 08:15:27 -0400
Subject: [PATCH] Added new lxc administration packages to lxc distribution

---
 config.lxc/nodeimage.pkgs |  2 ++
 lxc-tags.mk               |  2 ++
 lxc.mk                    | 17 +++++++++++++++++
 modules.list              |  2 ++
 4 files changed, 23 insertions(+)

diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index 501b881d..0457d8ac 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -5,6 +5,8 @@ groupname: PlanetLab
 groupdesc: PlanetLab Node Root
 # our own modules
 package: ipfwroot
+package: lxctools
+package: lxcsu
 package: transforward
 package: procprotect
 # packages to exclude from stock repositories
diff --git a/lxc-tags.mk b/lxc-tags.mk
index 38e48909..db381a77 100644
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -1,5 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
+lxcsu-GITPATH		:= git://git.planet-lab.org/lxcsu.git@master
+lxctools-GITPATH		:= git://git.planet-lab.org/lxctools.git@master
 transforward-GITPATH		:= git://git.onelab.eu/transforward.git@master
 procprotect-GITPATH		:= git://git.onelab.eu/procprotect.git@master
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-2
diff --git a/lxc.mk b/lxc.mk
index 3c5b8a84..e70fc9de 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -10,6 +10,23 @@
 
 ### the madwifi drivers ahip with fedora16's kernel rpm
 
+#
+# lxctools: scripts for entering containers
+#
+lxctools-MODULES := transforward
+lxctools-SPEC := transforward.spec
+ALL += lxctools
+IN_NODEIMAGE += lxctools
+
+#
+# lxcsu: root context module for entering namespaces
+#
+lxcsu-MODULES := lxcsu
+lxcsu-SPEC := lxcsu.spec
+ALL += lxcsu
+IN_NODEIMAGE += lxcsu
+
+#
 #
 # transforward: root context module for transparent port forwarding
 #
diff --git a/modules.list b/modules.list
index 7d6da827..f83df334 100644
--- a/modules.list
+++ b/modules.list
@@ -11,6 +11,8 @@ ipfw
 iptables
 libvirt
 linux-2.6:32
+lxcsu
+lxctools
 madwifi
 mom
 monitor
-- 
2.43.0