X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=2e03f6bee54e5f81123daede2061079e6611722f;hb=6e0f0beb542f11b450cfd98ccaea6d4c4a423725;hp=e7d546d4d367255de50c07beb6c60f6f91c1e345;hpb=1f523ed3f4a424649d03eb9a152bc1efd752c8e3;p=myplc.git

diff --git a/build.sh b/build.sh
index e7d546d..2e03f6b 100755
--- a/build.sh
+++ b/build.sh
@@ -50,8 +50,8 @@ pl_fixdirs root "${datadirs[@]}"
 echo "* myplc: Installing base filesystem"
 mkdir -p root data
 
-lst=${pldistro}-plc.lst
-make_chroot_from_lst root ${pl_DISTRO_NAME} $lst
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} myplc.pkgs)
+pl_root_setup_chroot root -f $pkgsfile
 
 # Install configuration scripts
 echo "* myplc: Installing configuration scripts"
@@ -65,6 +65,12 @@ install -D -m 755 plc-map.py root/usr/bin/plc-map.py
 install -D -m 755 clean-empty-dirs.py root/usr/bin/clean-empty-dirs.py
 install -D -m 755 mtail.py root/usr/bin/mtail.py
 install -D -m 755 check-ssl-peering.py root/usr/bin/check-ssl-peering.py
+# Extra scripts (mostly for mail and dns) not installed by myplc by default.  Used in production
+mkdir root/etc/support-scripts
+cp support-scripts/* root/etc/support-scripts 
+# copy initscripts to etc/plc_sliceinitscripts
+mkdir root/etc/plc_sliceinitscripts
+cp plc_sliceinitscripts/* root/etc/plc_sliceinitscripts
 
 # Install initscripts
 echo "* myplc: Installing initscripts"
@@ -72,32 +78,14 @@ find plc.d | cpio -p -d -u root/etc/
 install -D -m 755 guest.init root/etc/init.d/plc
 chroot root sh -c 'chkconfig --add plc; chkconfig plc on'
 
-# Install web scripts
-#echo "* myplc: Installing web scripts"
-#mkdir -p root/usr/bin
-#install -m 755 \
-    #$srcdir/plc/scripts/gen-sites-xml.py \
-    #$srcdir/plc/scripts/gen-slices-xml-05.py \
-    #$srcdir/plc/scripts/gen-static-content.py \
-    #root/usr/bin/
-
-### Thierry Parmentelat - april 16 2007
-### from now on we package plcwww separately in the plcwww rpm
-#### Install web pages
-###echo "* myplc: Installing web pages"
-###mkdir -p root/var/www/html
-###rsync -a $srcdir/new_plc_www/ root/var/www/html/
-
-#### Install Drupal rewrite rules
-###install -D -m 644 $srcdir/new_plc_www/drupal.conf root/etc/httpd/conf.d/drupal.conf
-
-### Thierry Parmentelat - april 16 2007
 # fetch the release stamp from the build if any
 # I could not come up with any more sensitive scheme 
 if [ -f ../../../myplc-release ] ; then
   cp ../../../myplc-release myplc-release
 else
-  echo "No build information found in ../.." > myplc-release
+  echo "Cannot find release information." > myplc-release
+  date >> myplc-release
+  echo "$HeadURL$" >> myplc-release
 fi
 # install it in /etc/myplc-release 
 install -m 444 myplc-release root/etc/myplc-release
@@ -109,13 +97,6 @@ install -m 444 myplc-release root/etc/myplc-release
 # yum_conf_to_build_host is defined in build.functions
 yum_conf_to_build_host > root/etc/yum.conf
 
-### Thierry Parmentelat - may 16 2007
-# the node-dependent image generation script requires root privilege
-# to perform various mount operations
-sudoers_bootcustom_apache > root/etc/sudoers
-chown root:root root/etc/sudoers
-chmod 400 root/etc/sudoers
-
 ### Thierry Parmentelat - july 20 2007
 # we now build the myplc doc
 # beware that making the pdf file somehow overwrites the html
@@ -131,7 +112,7 @@ done
 # we now build the plcapi doc
 # this generates a drupal php file from a docbook-generated html
 # quick & dirty
-docbook_html_to_drupal "OneLab PLCAPI Documentation" \
+docbook_html_to_drupal "${pldistro} PLCAPI Documentation" \
     root/usr/share/plc_api/doc/PLCAPI.html \
     root/var/www/html/planetlab/doc/plcapi.php
 # pdf just get copied