From 22febeb4353bd5b9ced3fdf0f842cc1cac262acb Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 29 Mar 2012 09:29:00 +0200
Subject: [PATCH] nodeimage instead of bootstrapfs

---
 README-pldistros.txt                          | 28 +++++++++----------
 .../{bootstrapfs.pkgs => nodeimage.pkgs}      |  0
 ...tstrapfs-umts.pkgs => nodeimage-umts.pkgs} |  0
 ...tstrapfs-wifi.pkgs => nodeimage-wifi.pkgs} |  0
 .../{bootstrapfs.pkgs => nodeimage.pkgs}      |  0
 .../{bootstrapfs.pkgs => nodeimage.pkgs}      |  0
 .../{bootstrapfs.post => nodeimage.post}      |  0
 7 files changed, 13 insertions(+), 15 deletions(-)
 rename config.lxc/{bootstrapfs.pkgs => nodeimage.pkgs} (100%)
 rename config.onelab/{bootstrapfs-umts.pkgs => nodeimage-umts.pkgs} (100%)
 rename config.onelab/{bootstrapfs-wifi.pkgs => nodeimage-wifi.pkgs} (100%)
 rename config.onelab/{bootstrapfs.pkgs => nodeimage.pkgs} (100%)
 rename config.planetlab/{bootstrapfs.pkgs => nodeimage.pkgs} (100%)
 rename config.planetlab/{bootstrapfs.post => nodeimage.post} (100%)

diff --git a/README-pldistros.txt b/README-pldistros.txt
index cdb3fee9..284cf0db 100644
--- a/README-pldistros.txt
+++ b/README-pldistros.txt
@@ -20,33 +20,31 @@ missing files are searched in the planetlab distro
 	set of packages required for building
 ./build/config.<pldistro>/bootcd.pkgs
 	contents of the bootcd image
-./build/config.<pldistro>/bootstrapfs.pkgs
-	the standard contents of the node root 
-	used to generate yumgroups.xml
-./build/config.<pldistro>/bootstrapfs.pkgs
-	specification for the contents of the core for the node
-	software
+./build/config.<pldistro>/nodeimage.pkgs
+	the standard contents of the node software
         this results in a tarball (tar.bz2) 
-./build/config.<pldistro>/bootstrapfs-*.pkgs
+	also used to generate yumgroups.xml on the plc side
+./build/config.<pldistro>/nodeimage-*.pkgs
 	each of these files results in an extension tarball
-./build/config.<pldistro>/myplc.pkgs
-	contents of the myplc image
-./build/config.<pldistro>/vserver.pkgs
+./build/config.<pldistro>/sliceimage.pkgs
 	the contents of the standard vserver reference image
-./build/config.<pldistro>/vserver-*.pkgs
+./build/config.<pldistro>/sliceimage-*.pkgs
 	all *.pkgs files here - produce additional vserver images
 ./build/config.<pldistro>/vtest.pkgs
 	used to create test vservers for myplc-native
+./build/config.<pldistro>/yumexclude.pkgs
+	describe the set of node packages that are produced by the myplc build
+	and thus should be excluded from the stock fedora repos
 
 === extensions
 as of this writing extensions are managed as follows:
-- at node installation, the tarball produced from bootstrapfs.pkgs is
-downloaded and untared to produce the core node setup
+- at node installation, the tarball produced from nodeimage.pkgs is
+downloaded and untared to produce the node root filesystem
 - then we attempt to install an extension corresponding to each of the
-nodegroups that the node is part of
+extensions that the node has in its 'extensions' tag
 - the first method is to try and download a tarball named after the
 extension. such tarballs are produced by the build from a .pkgs file,
 see above
 - if that fails, then the extension install is attempted through a
- yum groupinstall  extension<nodegroup>
+ yum groupinstall extension<nodegroup>
 
diff --git a/config.lxc/bootstrapfs.pkgs b/config.lxc/nodeimage.pkgs
similarity index 100%
rename from config.lxc/bootstrapfs.pkgs
rename to config.lxc/nodeimage.pkgs
diff --git a/config.onelab/bootstrapfs-umts.pkgs b/config.onelab/nodeimage-umts.pkgs
similarity index 100%
rename from config.onelab/bootstrapfs-umts.pkgs
rename to config.onelab/nodeimage-umts.pkgs
diff --git a/config.onelab/bootstrapfs-wifi.pkgs b/config.onelab/nodeimage-wifi.pkgs
similarity index 100%
rename from config.onelab/bootstrapfs-wifi.pkgs
rename to config.onelab/nodeimage-wifi.pkgs
diff --git a/config.onelab/bootstrapfs.pkgs b/config.onelab/nodeimage.pkgs
similarity index 100%
rename from config.onelab/bootstrapfs.pkgs
rename to config.onelab/nodeimage.pkgs
diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/nodeimage.pkgs
similarity index 100%
rename from config.planetlab/bootstrapfs.pkgs
rename to config.planetlab/nodeimage.pkgs
diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/nodeimage.post
similarity index 100%
rename from config.planetlab/bootstrapfs.post
rename to config.planetlab/nodeimage.post
-- 
2.43.0