git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d68033b
)
geni_config now lives in /etc/geni/
author
Tony Mack
<tmack@cs.princeton.edu>
Sun, 3 May 2009 03:14:01 +0000
(
03:14
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Sun, 3 May 2009 03:14:01 +0000
(
03:14
+0000)
geni/geniwrapper
patch
|
blob
|
history
diff --git
a/geni/geniwrapper
b/geni/geniwrapper
index
abfa428
..
59e9bb8
100644
(file)
--- a/
geni/geniwrapper
+++ b/
geni/geniwrapper
@@
-10,7
+10,7
@@
#
# Source config
#
# Source config
-. /
usr/share/geniwrapper/geni/util
/geni_config
+. /
etc/geni
/geni_config
# source function library
. /etc/init.d/functions
# source function library
. /etc/init.d/functions
@@
-21,13
+21,19
@@
start() {
if [ "$GENI_REGISTRY_ENABLE" ]; then
echo "Registry"
if [ "$GENI_REGISTRY_ENABLE" ]; then
echo "Registry"
- daemon
$GENI_BASE_DIR/geni
/plc.py -r -d $OPTIONS
+ daemon
/usr/bin
/plc.py -r -d $OPTIONS
fi
if [ "$GENI_AGGREGATE_ENABLED" ]; then
echo "Aggregate"
fi
if [ "$GENI_AGGREGATE_ENABLED" ]; then
echo "Aggregate"
- daemon
$GENI_BASE_DIR/geni
/plc.py -a -d $OPTIONS
+ daemon
/usr/bin
/plc.py -a -d $OPTIONS
fi
fi
+
+ if [ "$GENI_SM_ENABLED" ]; then
+ echo "SliceMgr"
+ daemon /usr/bin/plc.py -s -d $OPTIONS
+ fi
+
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/geniwrapper
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/geniwrapper