X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=d5d2a5773f2f91b644a0d8dfb387c6e41ac914ba;hb=c79162bdd04bad550646104a4e88bfae45ca30b2;hp=545d040bdc96a2a90f1bb33f3d489abc9dc1cb60;hpb=c751f72dce8c22f8b360508252d5328597dc5054;p=myplc.git

diff --git a/build.sh b/build.sh
index 545d040..d5d2a57 100755
--- a/build.sh
+++ b/build.sh
@@ -15,66 +15,11 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: build.sh,v 1.40 2007/01/30 16:03:20 mlhuang Exp $
 #
 
 . build.functions
 
-#
-# Build myplc inside myplc-devel. Infinite recursion is avoided only
-# if PLC_DEVEL_BOOTSTRAP is false in the default configuration file.
-#
-
-if [ "$PLC_DEVEL_BOOTSTRAP" = "true" ] ; then
-    # So that we don't pollute the actual myplc-devel image, we use
-    # the directory that was used to build the image instead of the
-    # image itself, and mount everything by hand.
-    mount -o bind,rw devel/data devel/root/data
-    mount -t proc none devel/root/proc
-
-    # If we used a local mirror, bind mount it into the chroot so that
-    # we can use it again.
-    if [ "${PLC_DEVEL_FEDORA_URL:0:7}" = "file://" ] ; then
-	mkdir -p devel/root/data/fedora
-	mount -o bind,ro ${PLC_DEVEL_FEDORA_URL#file://} devel/root/data/fedora
-    fi
-
-    # Clean up before exiting if anything goes wrong
-    trap "umount $PWD/devel/root/data/fedora;
-          umount $PWD/devel/root/data;
-          umount $PWD/devel/root/proc" ERR INT
-
-    # Build myplc inside myplc-devel. Make sure PLC_DEVEL_BOOTSTRAP is
-    # false to avoid infinite recursion.
-    chroot devel/root su - <<EOF
-set -x
-service plc start
-plc-config --category=plc_devel --variable=bootstrap --value="false" --save
-service plc reload
-cd /
-cvs -d /cvs checkout -r $BUILD_TAG build
-make TAG=$BUILD_TAG -C /build myplc
-EOF
-
-    # Yoink the image that was just built
-    mv devel/data/build/BUILD/myplc-*/myplc/root{,.img} devel/data/build/BUILD/myplc-*/myplc/data .
-
-    # Clean up
-    umount devel/root/data/fedora || :
-    umount devel/root/data
-    umount devel/root/proc
-    rm -rf devel/data/build
-    mkdir -p devel/data/build
-
-    # No need to continue
-    exit 0
-fi
-
-#
-# Build myplc in the host environment. This section is executed if
-# PLC_DEVEL_BOOTSTRAP is false.
-#
-
 # These directories are allowed to grow to unspecified size, so they
 # are stored as symlinks to the /data partition. mkfedora and yum
 # expect some of them to be real directories, however.
@@ -85,6 +30,8 @@ datadirs=(
 /var/www/html/alpina-logs
 /var/www/html/boot
 /var/www/html/download
+/var/www/html/files
+/var/www/html/sites
 /var/www/html/generated
 /var/www/html/install-rpms
 /var/www/html/xml
@@ -95,8 +42,10 @@ datadirs=(
 )
 for datadir in "${datadirs[@]}" ; do
     # If we are being re-run, it may be a symlink
-    rm -f root/$datadir || :
-    mkdir -p root/$datadir
+    if [ -h root/$datadir ] ; then
+	rm -f root/$datadir
+	mkdir -p root/$datadir
+    fi
 done
 
 echo "* myplc: Installing base filesystem"
@@ -109,7 +58,6 @@ install -D -m 755 plc_config.py root/tmp/plc_config.py
 chroot root sh -c 'cd /tmp; python plc_config.py build; python plc_config.py install'
 install -D -m 755 plc-config root/usr/bin/plc-config
 install -D -m 755 plc-config-tty root/usr/bin/plc-config-tty
-install -D -m 755 api-config root/usr/bin/api-config
 install -D -m 755 db-config root/usr/bin/db-config
 install -D -m 755 dns-config root/usr/bin/dns-config
 
@@ -131,12 +79,8 @@ install -m 755 \
 # Install web pages
 echo "* myplc: Installing web pages"
 mkdir -p root/var/www/html
-# Exclude old cruft, unrelated GENI pages, and official documents
 rsync -a $srcdir/new_plc_www/ root/var/www/html/
 
-# Make the Drupal files upload directory owned by Apache
-chown apache:apache root/var/www/html/files
-
 # Install Drupal rewrite rules
 install -D -m 644 $srcdir/new_plc_www/drupal.conf root/etc/httpd/conf.d/drupal.conf
 
@@ -167,7 +111,7 @@ rm -f data/var/www/html/boot/bootmanager.sh
 # Initialize node RPMs directory. The PlanetLab-Bootstrap.tar.bz2
 # tarball already contains all of the node RPMs pre-installed. Only
 # updates or optional packages should be placed in this directory.
-install -D -m 644 ../build/groups/v3_yumgroups.xml \
+install -D -m 644 ../build/groups/v4_yumgroups.xml \
     data/var/www/html/install-rpms/planetlab/yumgroups.xml
 
 # Make image out of directory