|
[-]
[+]
|
Changed |
opennebula.spec
|
|
|
|
[-]
[+]
|
Deleted |
openneb_64bitlib.patch
^
|
| @@ -1,20 +0,0 @@
---- SConstruct.orig
-+++ SConstruct
-@@ -89,7 +89,7 @@ main_env.Append(LINKFLAGS=['-g', '-pthre
- # SQLITE
- sqlite_dir=ARGUMENTS.get('sqlite_dir', 'none')
- if sqlite_dir!='none':
-- main_env.Append(LIBPATH=[sqlite_dir+"/lib"])
-+ main_env.Append(LIBPATH=[sqlite_dir+"/lib",sqlite_dir+"/lib64"])
- main_env.Append(CPPPATH=[sqlite_dir+"/include"])
-
- sqlite=ARGUMENTS.get('sqlite', 'yes')
-@@ -111,7 +111,7 @@ else:
- # xmlrpc
- xmlrpc_dir=ARGUMENTS.get('xmlrpc', 'none')
- if xmlrpc_dir!='none':
-- main_env.Append(LIBPATH=[xmlrpc_dir+"/lib"])
-+ main_env.Append(LIBPATH=[xmlrpc_dir+"/lib",xmlrpc_dir+"/lib64"])
- main_env.Append(CPPPATH=[xmlrpc_dir+"/include"])
-
- # build lex/bison
|
|
[-]
[+]
|
Changed |
openneb_LSBhead.patch
^
|
| @@ -1,9 +1,9 @@
---- share/scripts/one.orig 2012-02-18 19:17:50.462555851 +0100
-+++ share/scripts/one 2012-02-18 19:31:56.975887322 +0100
+--- share/scripts/one.orig 2012-10-29 09:00:34.239596761 +0100
++++ share/scripts/one 2012-10-29 09:02:30.491600164 +0100
@@ -16,6 +16,32 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
-
+
+# /etc/init.d/one
+### BEGIN INIT INFO
+# Provides: one
@@ -33,55 +33,55 @@
if [ -z "$ONE_LOCATION" ]; then
ONE_PIDDIR=/var/run/one
ONE_PID=/var/run/one/oned.pid
-@@ -135,7 +161,7 @@
+@@ -136,7 +162,7 @@
fi
-
+
# Start the one daemon
- $ONED -f 2>&1 &
-+ /sbin/startproc -u oneadmin -g cloud $ONED -f 2>&1
-
++ /sbin/startproc -u oneadmin -g cloud $ONED -f 2>&1
+
LASTRC=$?
- LASTPID=`pidof $ONED`
-@@ -148,7 +174,7 @@
+ LASTPID=$!
+@@ -149,7 +175,7 @@
fi
-
+
# Start the scheduler
- $ONE_SCHEDULER&
+ /sbin/startproc -u oneadmin -g cloud $ONE_SCHEDULER&
-
+
LASTRC=$?
- LASTPID=`pidof $ONE_SCHEDULER`
-@@ -181,7 +207,7 @@
-
+ LASTPID=$!
+@@ -182,7 +208,7 @@
+
if [ "$STARTED" == "false" ]; then
stop
- exit -1
+ exit 7
fi
}
-
-@@ -197,13 +223,23 @@
+
+@@ -198,13 +224,23 @@
start)
setup
start
-+ rc_status -v
++ rc_status -v
;;
stop)
stop
echo "oned and scheduler stopped"
-+ rc_status -v
++ rc_status -v
;;
+ restart)
-+ $0 stop
-+ $0 start
-+ rc_status
-+ ;;
++ $0 stop
++ $0 start
++ rc_status
++ ;;
+ reload)
-+ $0 restart
-+ ;;
++ $0 restart
++ ;;
*)
-- echo "Usage: one [-b] {start|stop}" >&2
-+ echo "Usage: one [-b] {start|stop|reload|restart}" >&2
+- echo "Usage: one [-f] {start|stop}" >&2
++ echo "Usage: one [-f] {start|stop|reload|restart}" >&2
echo "Options:" >&2
- echo " -b Backup log file." >&2
+ echo " -f Do not backup log file." >&2
exit 3
|
|
[-]
[+]
|
Added |
openneb_LSBhead.patch.old
^
|
| @@ -0,0 +1,87 @@
+--- 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. #
+ #--------------------------------------------------------------------------- #
+
++# /etc/init.d/one
++### BEGIN INIT INFO
++# Provides: one
++# Required-Start: $remote_fs $syslog $network
++# Required-Stop: $remote_fs $syslog
++# Default-Start: 3 5
++# Default-Stop: 0 1 2 6
++# Short-Description: Cloud infrastructure service
++# Description: The oned is the daemon process controlling the OpenNebula
++# cloud instrastructure
++### END INIT INFO
++
++# First reset status of this service
++. /etc/rc.status
++rc_reset
++
++# Return values acc. to LSB for all commands but status:
++# 0 - success
++# 1 - generic or unspecified error
++# 2 - invalid or excess argument(s)
++# 3 - unimplemented feature (e.g. "reload")
++# 4 - insufficient privilege
++# 5 - program is not installed
++# 6 - program is not configured
++# 7 - program is not running
++
+ if [ -z "$ONE_LOCATION" ]; then
+ ONE_PIDDIR=/var/run/one
+ ONE_PID=/var/run/one/oned.pid
+@@ -135,7 +161,7 @@
+ fi
+
+ # Start the one daemon
+- $ONED -f 2>&1 &
++ /sbin/startproc -u oneadmin -g cloud $ONED -f 2>&1
+
+ LASTRC=$?
+ LASTPID=`pidof $ONED`
+@@ -148,7 +174,7 @@
+ fi
+
+ # Start the scheduler
+- $ONE_SCHEDULER&
++ /sbin/startproc -u oneadmin -g cloud $ONE_SCHEDULER&
+
+ LASTRC=$?
+ LASTPID=`pidof $ONE_SCHEDULER`
+@@ -181,7 +207,7 @@
+
+ if [ "$STARTED" == "false" ]; then
+ stop
+- exit -1
++ exit 7
+ fi
+ }
+
+@@ -197,13 +223,23 @@
+ start)
+ setup
+ start
++ rc_status -v
+ ;;
+ stop)
+ stop
+ echo "oned and scheduler stopped"
++ rc_status -v
+ ;;
++ restart)
++ $0 stop
++ $0 start
++ rc_status
++ ;;
++ reload)
++ $0 restart
++ ;;
+ *)
+- echo "Usage: one [-b] {start|stop}" >&2
++ echo "Usage: one [-b] {start|stop|reload|restart}" >&2
+ echo "Options:" >&2
+ echo " -b Backup log file." >&2
+ exit 3
|
|
|
Changed |
opennebula-3.8.1.tar.bz2
^
|
