X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build-native.sh;h=bc4930b39ba438fd610c0a40b6079b8830a4b843;hb=refs%2Fheads%2F4.2;hp=6e6b7ae7287e812a6e314bf981e35498d1751e2c;hpb=475825699b05616da35d2cdb045e3bfb0da6dddf;p=myplc.git

diff --git a/build-native.sh b/build-native.sh
index 6e6b7ae..bc4930b 100755
--- a/build-native.sh
+++ b/build-native.sh
@@ -18,41 +18,48 @@
 
 # Install configuration scripts
 echo "* myplc-native: Installing configuration scripts"
-tmpdir=$1
-mkdir -p ${tmpdir}
+pldistro=$1; shift
+tmpdir=$1 ; shift
 rm -rf ${tmpdir}
 mkdir -p ${tmpdir}
+echo "* myplc-native: installing plc_config.py in /usr/share/myplc"
+install -D -m 755 plc_config.py ${tmpdir}/usr/share/myplc/plc_config.py
 install -D -m 755 plc-config ${tmpdir}/usr/bin/plc-config
 install -D -m 755 plc-config-tty ${tmpdir}/usr/bin/plc-config-tty
 install -D -m 755 db-config ${tmpdir}/usr/bin/db-config
 install -D -m 755 dns-config ${tmpdir}/usr/bin/dns-config
-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
-
-echo "* myplc-native: skipping build/install of plc_config.py"
-# XXX needs to be done by %pre script in .spec file
-# install -D -m 755 plc_config.py /tmp/plc_config.py
-# sh -c 'cd ${tmpdir}; python plc_config.py build; python plc_config.py install'
-# XXX needs to be done by %pre script in .spec file
-# sh -c 'chkconfig --add plc; chkconfig plc on'
+install -D -m 755 plc-map.py ${tmpdir}/usr/bin/plc-map.py
+install -D -m 755 clean-empty-dirs.py ${tmpdir}/usr/bin/clean-empty-dirs.py
+install -D -m 755 mtail.py ${tmpdir}/usr/bin/mtail.py
+install -D -m 755 check-ssl-peering.py ${tmpdir}/usr/bin/check-ssl-peering.py
+# Extra scripts (mostly for mail and dns) not installed by myplc by default.  Used in production
+mkdir -p ${tmpdir}/etc/support-scripts
+cp support-scripts/* ${tmpdir}/etc/support-scripts
+# copy initscripts to etc/plc_sliceinitscripts
+mkdir -p ${tmpdir}/etc/plc_sliceinitscripts
+cp plc_sliceinitscripts/* ${tmpdir}/etc/plc_sliceinitscripts
 
 # Install initscripts
 echo "* myplc-native: Installing initscripts"
 find plc.d | cpio -p -d -u ${tmpdir}/etc/
 install -D -m 755 guest.init ${tmpdir}/etc/init.d/plc
 
+# fetch the release stamp from the build if any
+if [ -f ../../../myplc-release ] ; then
+  cp ../../../myplc-release myplc-release
+else
+  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 ${tmpdir}/etc/myplc-release
 
 # Install configuration file
 echo "* myplc: Installing configuration file"
 install -D -m 444 default_config.xml ${tmpdir}/etc/planetlab/default_config.xml
 install -D -m 444 plc_config.dtd ${tmpdir}/etc/planetlab/plc_config.dtd
 
-# 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 $pl_DISTRO_YUMGROUPS \
-    ${tmpdir}/var/www/html/install-rpms/planetlab/yumgroups.xml
+# yumgroups.xml and yum repo : let noderepo handle that
 
 exit 0