X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=build-native.sh;h=d1888bb5aa9bc2cdd04ba69a96b140b2af219046;hb=c266971e752cd413423f574315c38f1f46cdfb9c;hp=54a2685691432b6a9e7055c3135a5f77d836a47b;hpb=8503676ec0c28f534bab1888ae1a1cb8ff22d572;p=myplc.git

diff --git a/build-native.sh b/build-native.sh
index 54a2685..d1888bb 100755
--- a/build-native.sh
+++ b/build-native.sh
@@ -9,7 +9,7 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2007 The Trustees of Princeton University
 #
-# $Id: build-native.sh,v 1.1.2.5 2007/08/31 17:46:11 mef Exp $
+# $Id$
 #
 
 . build.functions
@@ -22,19 +22,22 @@ tmpdir=$1
 mkdir -p ${tmpdir}
 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
-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"
@@ -42,24 +45,15 @@ find plc.d | cpio -p -d -u ${tmpdir}/etc/
 install -D -m 755 guest.init ${tmpdir}/etc/init.d/plc
 
 
-# Install web scripts
-#echo "* myplc: Installing web scripts"
-#mkdir -p ${tmpdir}/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 \
-#    ${tmpdir}/usr/bin/
-
 # Install configuration file
 echo "* myplc: Installing configuration file"
-install -D -m 444 plc_config.xml ${tmpdir}/etc/planetlab/default_config.xml
+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_YUMGROUPSXML \
+install -D -m 644 $pl_DISTRO_YUMGROUPS \
     ${tmpdir}/var/www/html/install-rpms/planetlab/yumgroups.xml
 
 exit 0