triggers pl_boot under upstart

[bootcd.git] / prep.sh

diff --git a/prep.sh b/prep.sh
index 8de319c..68bebcf 100755 (executable)
--- a/prep.sh
+++ b/prep.sh
@@ -57,21 +57,36 @@ install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
 # Install configuration files
 echo "* Installing configuration files"
 for file in fstab mtab modprobe.conf inittab hosts sysctl.conf ; do
-    install -D -m 644 conf_files/$file $bootcd/etc/$file
+    install -D -m 644 etc/$file $bootcd/etc/$file
 done
 
 # Install initscripts
 echo "* Installing initscripts"
 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
+    sed -i -e "s,@PLDISTRO@,$pldistro,g" -e "s,@FCDISTRO@,$fcdistro,g" initscripts/$file
+    install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file
 done
 
+# connect the scripts for upstart
+# fedora 9 comes with /sbin/init from upstart, that uses /etc/event.d instead of inittab
+# (in fact inittab is read for determining the default runlevel)
+if [ -d $bootcd/etc/event.d ] ; then
+    echo "* Tuning /etc/event.d for upstart"
+    pushd $bootcd/etc/event.d
+    # use our system initialisation script
+    sed -i -e 's,/etc/rc.d/rc.sysinit[a-z\.]*,/etc/init.d/pl_sysinit,g' *
+    # use our startup script in runlevel 2
+    sed -i -e 's,/etc/rc\.d/rc[ \t][ \t]*2,/etc/init.d/pl_boot,g' rc2
+    popd    
+fi
+
 # Write nodefamily stamp, to help bootmanager do the right thing
-echo $nodefamily > $bootcd/etc/nodefamily
+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 conf_files/default-net.cnf $bootcd/usr/boot/default-net.cnf
+install -D -m 644 usr-boot/default-node.txt $bootcd/usr/boot/default-node.txt
 
 # Copy /etc/passwd out
 install -D -m 644 $bootcd/etc/passwd build/passwd
@@ -97,12 +112,4 @@ ln -sf /sbin/init $bootcd/init
 echo "* Compressing reference image"
 (cd $bootcd && find . | cpio --quiet -c -o) | gzip -9 > $isofs/bootcd.img
 
-# Build syslinux
-# echo "* Building syslinux"
-# CFLAGS="-Werror -Wno-unused -finline-limit=2000" make -C syslinux
-
-# Install isolinux
-#echo "* Installing isolinux"
-#install -D -m 644 syslinux/isolinux.bin $isofs/isolinux.bin
-
 exit 0