X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=a10ac880d9de5e79308233cb16ea1901785117c6;hb=8567420399833aebe1b32de439dbd841a762e0ff;hp=7ce888d91f0562eed43926f317d5b945cffb6837;hpb=c7e9ad5a295d1778355717f407b20d51cdf8ec47;p=myplc.git

diff --git a/build.sh b/build.sh
index 7ce888d..a10ac88 100755
--- 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"
@@ -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 etc/plc_sliceinitscripts
+cp plc_sliceinitscripts/* etc/plc_sliceinitscripts
 
 # Install initscripts
 echo "* myplc: Installing initscripts"
@@ -77,7 +83,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 +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
@@ -111,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