Merge commit 'origin/master'

diff --git a/bin/partial-repo.sh b/bin/partial-repo.sh
deleted file mode 100755 (executable)
index 09771c0..0000000
--- a/bin/partial-repo.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# $URL$
-
-COMMAND=$(basename $0)
-
-function usage () {
-    echo "Usage: $COMMAND repo1..."
-    echo "  a 'RPMS' subdir is expected in each repo arg"
-    exit 1
-}
-
-[[ -n "$@" ]] || usage
-
-set -e 
-
-for repo in "$@" ; do
-    if [ ! -d $repo/RPMS ] ; then
-       echo could not find $repo/RPMS - ignored
-       continue
-    fi
-
-    cd $repo
-    echo "==================== Dealing with repo $repo"
-    mkdir -p PARTIAL-RPMS
-    rsync --archive --verbose $(find RPMS -type f | egrep '/(bootcd|bootstrapfs|noderepo)-.*-.*-.*-.*rpm') PARTIAL-RPMS/
-    echo "==================== building packages index in $repo .."
-    createrepo PARTIAL-RPMS
-    echo '==================== DONE'
-    cd - >& /dev/null
-done

diff --git a/default_config.xml b/default_config.xml
index 726749b..bfaf788 100644 (file)
--- a/default_config.xml
+++ b/default_config.xml
@@ -810,6 +810,27 @@ $URL$
         </variable>
       </variablelist>
     </category>
+    <category id="myslice">
+      <name>MySlice</name>
+      <description>MySlice configuration parameters</description>
+      <variablelist>
+       <variable id="comon_url" type="string">
+         <name>comon</name>
+         <value></value>
+         <description>The address of the CoMon url that provides information for this PLC's nodes (if not the default http://comon.cs.princeton.edu/)</description>
+       </variable>
+       <variable id="comon_available" type="boolean">
+         <name>comon</name>
+         <value>false</value>
+         <description>True, if comon data are available for this PLC's nodes</description>
+       </variable>
+       <variable id="tophat_available" type="boolean">
+         <name>tophat</name>
+         <value>false</value>
+         <description>True, if tophat data are available for this PLC's nodes</description>
+       </variable>
+      </variablelist>
+    </category>
   </variables>
 
   <comps>

diff --git a/myplc.spec b/myplc.spec
index 5a3dc0d..c5451a6 100644 (file)
--- a/myplc.spec
+++ b/myplc.spec
@@ -72,14 +72,13 @@ Requires: myplc-config
 
 %define debug_package %{nil}
 
-%description
-MyPLC is a complete PlanetLab Central (PLC) portable installation
-contained within a chroot jail. The default installation consists of a
-web server, an XML-RPC API server, a boot server, and a database
-server: the core components of PLC. The installation may be customized
-through a graphical interface. All PLC services are started up and
-shut down through a single System V init script installed in the host
-system.
+%description 
+MyPLC is a complete PlanetLab Central (PLC) portable installation.
+The default installation consists of a web server, an XML-RPC API
+server, a boot server, and a database server: the core components of
+PLC. The installation may be customized through a graphical
+interface. All PLC services are started up and shut down through a
+single System V init script.
 
 ####################### myplc-config
 
@@ -232,7 +231,6 @@ fi
 /usr/bin/db-config
 /usr/bin/dns-config
 /usr/bin/refresh-peer.py*
-/usr/bin/partial-repo.sh
 /usr/bin/mtail.py*
 /usr/bin/plc-map.py*
 /usr/bin/plc-kml.py*