From c46346fd480fdf2f804dc8c6cf2a86d5b0cbbd12 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 4 Jun 2013 18:26:31 +0200 Subject: [PATCH] rename lxctools into lxc-userspace --- config.lxc/nodeimage.pkgs | 2 +- lxc-tags.mk | 2 +- lxc.mk | 10 +++++----- modules.list | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs index e19102f5..b63ec5fa 100644 --- 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 14e3a354..a9cf5afc 100644 --- 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 f2f0726a..71366590 100644 --- 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 a8e600a5..c9a80c22 100644 --- a/modules.list +++ b/modules.list @@ -10,7 +10,7 @@ ipfw iptables libvirt linux-2.6:32 -lxctools +lxc-userspace madwifi mom monitor -- 2.43.0