X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=support-files%2Fbuildnode.sh;h=0bbc6eadcd92c28598a91fdf5bd306634e245368;hb=e21e3512b12d0c6148c1aee684991546e5b7320f;hp=3fc005b5bae6dcd4c4f80470dbda78ed46acb374;hpb=48beab6dd94246ff981ccd1acfe06ad96cf6dd54;p=bootmanager.git

diff --git a/support-files/buildnode.sh b/support-files/buildnode.sh
index 3fc005b..0bbc6ea 100755
--- a/support-files/buildnode.sh
+++ b/support-files/buildnode.sh
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005-2006 The Trustees of Princeton University
 #
-# $Id: buildnode.sh,v 1.7 2006/04/05 21:45:34 mlhuang Exp $
+# $Id: buildnode.sh,v 1.10 2006/04/11 22:13:18 mlhuang Exp $
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -25,7 +25,7 @@ fi
 export PATH
 
 # Release and architecture to install
-releasever=2
+releasever=4
 basearch=i386
 
 usage()
@@ -69,20 +69,22 @@ export PL_BOOTCD=1
 # mkfedora runs either yum-arch or createrepo on that directory. dev
 # is specified explicitly because of a stupid bug in its %post script
 # that causes its installation to fail; see the mkfedora script for a
-# full explanation. coreutils is specified explicitly because
-# groupinstall does not honor Requires(pre) dependencies properly, and
-# most %pre scripts require coreutils to be installed first.
-mkfedora -v -r $releasever -a $basearch -p dev -p coreutils -g PlanetLab $VROOT
+# full explanation. coreutils and python are specified explicitly
+# because groupinstall does not honor Requires(pre) dependencies
+# properly, most %pre scripts require coreutils to be installed first,
+# and some of our %post scripts require python.
+mkfedora -v -r $releasever -a $basearch -k -p dev -p coreutils -p python -g PlanetLab $VROOT
 
 # Disable unnecessary services
 echo "* Disabling unnecessary services"
 for service in netfs rawdevices cpuspeed smartd ; do
-    /usr/sbin/chroot $VROOT /sbin/chkconfig $service off
+    if [ -x $VROOT/etc/init.d/$service ] ; then
+	/usr/sbin/chroot $VROOT /sbin/chkconfig $service off
+    fi
 done
 
 # Build tarball
 echo "* Building bootstrap tarball"
 tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C $VROOT .
-rm -rf $VROOT
 
 exit 0