svn keywords.

[myplc.git] / build.sh

diff --git a/build.sh b/build.sh
index 7ce888d..eaf38c0 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -51,7 +51,7 @@ echo "* myplc: Installing base filesystem"
 mkdir -p root data
 
 pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} myplc.pkgs)
-pl_setup_chroot root -f $pkgsfile
+pl_root_setup_chroot root -f $pkgsfile
 
 # Install configuration scripts
 echo "* myplc: Installing configuration scripts"
@@ -77,7 +77,9 @@ chroot root sh -c 'chkconfig --add plc; chkconfig plc on'
 if [ -f ../../../myplc-release ] ; then
   cp ../../../myplc-release myplc-release
 else
-  echo "No build release information found" > 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
@@ -89,13 +91,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
@@ -111,7 +106,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