[-]
[+]
|
Changed |
opennebula.changes
|
|
[-]
[+]
|
Changed |
opennebula.spec
^
|
|
[-]
[+]
|
Changed |
openneb_LSBhead.patch
^
|
@@ -1,5 +1,5 @@
---- share/scripts/one.orig
-+++ share/scripts/one
+--- share/scripts/one.orig 2012-02-18 19:17:50.462555851 +0100
++++ share/scripts/one 2012-02-18 19:31:56.975887322 +0100
@@ -16,6 +16,32 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
@@ -33,7 +33,7 @@
if [ -z "$ONE_LOCATION" ]; then
ONE_PIDDIR=/var/run/one
ONE_PID=/var/run/one/oned.pid
-@@ -130,7 +156,7 @@ start()
+@@ -135,7 +161,7 @@
fi
# Start the one daemon
@@ -41,17 +41,17 @@
+ /sbin/startproc -u oneadmin -g cloud $ONED -f 2>&1
LASTRC=$?
- LASTPID=$!
-@@ -153,7 +179,7 @@ start()
- # [-h host dispatch] max number of VMs dispatched to a given host in each
- # scheduling action - default: 1
+ LASTPID=`pidof $ONED`
+@@ -148,7 +174,7 @@
+ fi
-- $ONE_SCHEDULER -p $PORT -t 30 -m 300 -d 30 -h 1&
-+ /sbin/startproc -u oneadmin -g cloud $ONE_SCHEDULER -p $PORT -t 30 -m 300 -d 30 -h 1
+ # Start the scheduler
+- $ONE_SCHEDULER&
++ /sbin/startproc -u oneadmin -g cloud $ONE_SCHEDULER&
LASTRC=$?
- LASTPID=$!
-@@ -186,7 +212,7 @@ start()
+ LASTPID=`pidof $ONE_SCHEDULER`
+@@ -181,7 +207,7 @@
if [ "$STARTED" == "false" ]; then
stop
@@ -60,7 +60,7 @@
fi
}
-@@ -202,13 +228,23 @@ case "$1" in
+@@ -197,13 +223,23 @@
start)
setup
start
|
[-]
[+]
|
Changed |
openneb_creatPIDdir.patch
^
|
@@ -1,5 +1,5 @@
---- share/scripts/one.orig
-+++ share/scripts/one
+--- share/scripts/one.orig 2012-01-26 19:01:43.000000000 +0100
++++ share/scripts/one 2012-02-18 19:17:01.282744892 +0100
@@ -17,6 +17,7 @@
#--------------------------------------------------------------------------- #
@@ -8,7 +8,7 @@
ONE_PID=/var/run/one/oned.pid
ONE_SCHEDPID=/var/run/one/sched.pid
ONE_CONF=/etc/one/oned.conf
-@@ -28,6 +29,7 @@ if [ -z "$ONE_LOCATION" ]; then
+@@ -28,6 +29,7 @@
LOCK_FILE=/var/lock/one/one
else
@@ -16,15 +16,14 @@
ONE_PID=$ONE_LOCATION/var/oned.pid
ONE_SCHEDPID=$ONE_LOCATION/var/sched.pid
ONE_CONF=$ONE_LOCATION/etc/oned.conf
-@@ -53,6 +55,11 @@ setup()
- exit 1
- fi
-
-+ if [ ! -d $ONE_PIDDIR ]; then
-+ mkdir $ONE_PIDDIR
-+ chown oneadmin:cloud $ONE_PIDDIR
-+ fi
-+
+@@ -48,6 +50,10 @@
+ setup()
+ {
if [ -f $LOCK_FILE ]; then
++ if [ ! -d $ONE_PIDDIR ]; then
++ mkdir $ONE_PIDDIR
++ chown oneadmin:cloud $ONE_PIDDIR
++ fi
if [ -f $ONE_PID ]; then
ONEPID=`cat $ONE_PID`
+ ps $ONEPID > /dev/null 2>&1
|
|
Changed |
opennebula-3.2.1.tar.bz2
^
|