git://git.onelab.eu
/
myplc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make GPG key readable by apache so that the API can sign peer requests
[myplc.git]
/
guest.init
diff --git
a/guest.init
b/guest.init
index
d01b345
..
38632fe
100755
(executable)
--- a/
guest.init
+++ b/
guest.init
@@
-6,7
+6,7
@@
#
# description: Manages all PLC services on this machine
#
#
# description: Manages all PLC services on this machine
#
-# $Id: guest.init,v 1.1
8 2006/06/23 21:48:4
1 mlhuang Exp $
+# $Id: guest.init,v 1.1
9 2006/07/10 21:10:2
1 mlhuang Exp $
#
# Source function library and configuration
#
# Source function library and configuration
@@
-33,6
+33,8
@@
nsteps=${#steps[@]}
# Regenerate configuration files
reload ()
{
# Regenerate configuration files
reload ()
{
+ force=$1
+
# Regenerate the main configuration file from default values
# overlaid with site-specific and current values.
files=(
# Regenerate the main configuration file from default values
# overlaid with site-specific and current values.
files=(
@@
-41,7
+43,7
@@
reload ()
/etc/planetlab/plc_config.xml
)
for file in "${files[@]}" ; do
/etc/planetlab/plc_config.xml
)
for file in "${files[@]}" ; do
- if [ $file -nt /etc/planetlab/plc_config.xml ] ; then
+ if [
-n "$force" -o
$file -nt /etc/planetlab/plc_config.xml ] ; then
tmp=$(mktemp /tmp/plc_config.xml.XXXXXX)
plc-config --xml "${files[@]}" >$tmp
if [ $? -eq 0 ] ; then
tmp=$(mktemp /tmp/plc_config.xml.XXXXXX)
plc-config --xml "${files[@]}" >$tmp
if [ $? -eq 0 ] ; then
@@
-56,10
+58,10
@@
reload ()
done
# Convert configuration to various formats
done
# Convert configuration to various formats
- if [ /etc/planetlab/plc_config.xml -nt /etc/planetlab/plc_config ] ; then
+ if [
-n "$force" -o
/etc/planetlab/plc_config.xml -nt /etc/planetlab/plc_config ] ; then
plc-config --shell >/etc/planetlab/plc_config
fi
plc-config --shell >/etc/planetlab/plc_config
fi
- if [ /etc/planetlab/plc_config.xml -nt /etc/planetlab/php/plc_config.php ] ; then
+ if [
-n "$force" -o
/etc/planetlab/plc_config.xml -nt /etc/planetlab/php/plc_config.php ] ; then
mkdir -p /etc/planetlab/php
plc-config --php >/etc/planetlab/php/plc_config.php
fi
mkdir -p /etc/planetlab/php
plc-config --php >/etc/planetlab/php/plc_config.php
fi
@@
-117,7
+119,7
@@
command=$1
shift 1
if [ -z "$1" ] ; then
# Start or stop everything. Regenerate configuration first.
shift 1
if [ -z "$1" ] ; then
# Start or stop everything. Regenerate configuration first.
- reload
+ reload
force
else
# Start or stop a particular step
steps=("$@")
else
# Start or stop a particular step
steps=("$@")
@@
-166,6
+168,7
@@
case "$command" in
;;
reload)
;;
reload)
+ reload force
;;
*)
;;
*)