fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodec...

  now known as the nodeyum package
  (might need some moer work for properly handling kexcludes in multi-fc plcs)
cleaned up all uses of /etc/planetlab/{node,slice}family
nodeconfig now does not need the build/ module anymore at build time

diff --git a/bootcd.spec b/bootcd.spec
index c8a4f81..c801cac 100644 (file)
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -104,9 +104,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 /etc/plc.d
 
-%post
-[ -f /etc/planetlab/nodefamily ] || { mkdir -p /etc/planetlab ; echo %{nodefamily} > /etc/planetlab/nodefamily ; }
-
 %changelog
 * Sat Jan 09 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootCD-4.2-17
 - support for fedora 12

diff --git a/plc.d/bootcd b/plc.d/bootcd
index 2a3469b..ba981b6 100755 (executable)
--- a/plc.d/bootcd
+++ b/plc.d/bootcd
@@ -25,8 +25,7 @@ case "$1" in
            exit 0
        fi
 
-       MESSAGE=$"Rebuilding Boot CD"
-       dialog "$MESSAGE"
+       dialog $"Rebuilding Boot CD"
 
        # Customize the Boot CD : run build.sh on all available bootcd's
        shopt -s nullglob
@@ -38,6 +37,7 @@ case "$1" in
            [ -d ${download} ] || mkdir -p ${download}
 
            pushd ${download}
+           action $"Rebuilding BootCD" "$name"
            ${bootcd}/build.sh ${PLC_BUILD_ALL_BOOTCDS:+-a}
            check
            popd

diff --git a/prep.sh b/prep.sh
index fe69c92..0f7a999 100755 (executable)
--- a/prep.sh
+++ b/prep.sh
@@ -84,10 +84,6 @@ if [ -d $bootcd/etc/event.d ] ; then
     popd    
 fi
 
-# Write nodefamily stamp, to help bootmanager do the right thing
-mkdir -p $bootcd/etc/planetlab
-echo $nodefamily > $bootcd/etc/planetlab/nodefamily
-
 # Install fallback node configuration file
 echo "* Installing fallback node configuration file"
 install -D -m 644 usr-boot/default-node.txt $bootcd/usr/boot/default-node.txt