write nodefamily in /etc/nodefamily (bootcd.img) and in build/nodefamily, to help...

diff --git a/bootcd.spec b/bootcd.spec
index 41fc099..0623eac 100644 (file)
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -43,7 +43,7 @@ environment.
 pushd BootCD
 
 # Build the reference image
-./prep.sh %{pldistro}
+./prep.sh %{pldistro} %{nodefamily}
 
 popd
 
@@ -60,7 +60,7 @@ tar cpf - \
     build/isofs/kernel \
     build/passwd \
     build/version.txt \
-       bootcustom.sh \
+    build/nodefamily \
     configurations | \
     tar -C $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -xpf -
 

diff --git a/prep.sh b/prep.sh
index 0ddafb1..8de319c 100755 (executable)
--- a/prep.sh
+++ b/prep.sh
@@ -28,8 +28,8 @@ export PATH
 
 . build.common
 
-# pldistro expected as $1 - defaults to planetlab
 pldistro=$1 ; shift
+nodefamily=$1; shift
 
 # Packages to install, junk and precious : see build/<pldistro>/bootcd.pkgs
 
@@ -41,7 +41,8 @@ bootcd=$PWD/build/bootcd
 install -d -m 755 $bootcd
 
 # Write version number
-rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 >build/version.txt
+rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 > build/version.txt
+echo $nodefamily > build/nodefamily
 
 # Install base system
 pl_root_makedevs $bootcd
@@ -65,6 +66,9 @@ for file in pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
     install -D -m 755 conf_files/$file $bootcd/etc/init.d/$file
 done
 
+# Write nodefamily stamp, to help bootmanager do the right thing
+echo $nodefamily > $bootcd/etc/nodefamily
+
 # Install fallback node configuration file
 echo "* Installing fallback node configuration file"
 install -D -m 644 conf_files/default-net.cnf $bootcd/usr/boot/default-net.cnf
@@ -91,7 +95,7 @@ ln -sf /sbin/init $bootcd/init
 
 # Pack the rest into a compressed archive
 echo "* Compressing reference image"
-(cd $bootcd && find . | cpio --quiet -c -o) | gzip -9 >$isofs/bootcd.img
+(cd $bootcd && find . | cpio --quiet -c -o) | gzip -9 > $isofs/bootcd.img
 
 # Build syslinux
 # echo "* Building syslinux"