rename lxctools into lxc-userspace

diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index e19102f..b63ec5f 100644 (file)
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -5,7 +5,7 @@ groupname: PlanetLab
 groupdesc: PlanetLab Node Root
 # our own modules
 package: ipfwroot
-package: lxctools
+package: lxc-userspace
 package: transforward
 package: procprotect
 # packages to exclude from stock repositories

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 14e3a35..a9cf5af 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -1,6 +1,6 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
-lxctools-GITPATH                := git://git.planet-lab.org/lxctools.git@lxctools-0.9-8
+lxc-userspace-GITPATH           := git://git.planet-lab.org/lxc-userspace.git@master
 transforward-GITPATH           := git://git.planet-lab.org/transforward.git@transforward-0.1-3
 procprotect-GITPATH             := git://git.planet-lab.org/procprotect.git@procprotect-0.3-4
 ipfw-GITPATH                    := git://git.code.sf.net/p/dummynet/code@ipfw-20130423-1

diff --git a/lxc.mk b/lxc.mk
index f2f0726..7136659 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -11,12 +11,12 @@
 ### the madwifi drivers ship with fedora16's kernel rpm
 
 #
-# lxctools: scripts for entering containers
+# lxc-userspace: scripts for entering containers
 #
-lxctools-MODULES := lxctools
-lxctools-SPEC := lxctools.spec
-ALL += lxctools
-IN_NODEIMAGE += lxctools
+lxc-userspace-MODULES := lxc-userspace
+lxc-userspace-SPEC := lxc-userspace.spec
+ALL += lxc-userspace
+IN_NODEIMAGE += lxc-userspace
 
 #
 #

diff --git a/modules.list b/modules.list
index a8e600a..c9a80c2 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -10,7 +10,7 @@ ipfw
 iptables
 libvirt
 linux-2.6:32
-lxctools
+lxc-userspace
 madwifi
 mom
 monitor