pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 202896 from Virtualization

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/202896
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=131
This commit is contained in:
Tomáš Chvátal 2013-10-11 06:55:02 +00:00 committed by Git OBS Bridge
commit 3110f93d27
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvirt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Oct 3 11:04:26 MDT 2013 - jfehlig@suse.com
- Fix condrestart|try-restart invocation of virtlockd init script
Modifed virtlockd-init-script.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 17 16:29:20 MDT 2013 - jfehlig@suse.com Tue Sep 17 16:29:20 MDT 2013 - jfehlig@suse.com

15
virtlockd-init-script.patch
View File

@ -34,7 +34,7 @@ Index: libvirt-1.1.2/src/locking/virtlockd.init.in
### END INIT INFO ### END INIT INFO
# the following is chkconfig init header # the following is chkconfig init header
@@ -23,35 +25,31 @@ @@ -23,35 +25,33 @@
# pidfile: @localstatedir@/run/libvirt/virtlockd.pid # pidfile: @localstatedir@/run/libvirt/virtlockd.pid
# #
@ -45,8 +45,10 @@ Index: libvirt-1.1.2/src/locking/virtlockd.init.in
SERVICE=virtlockd SERVICE=virtlockd
-PROCESS=virtlockd -PROCESS=virtlockd
-PIDFILE=@localstatedir@/run/libvirt/lockd/$SERVICE.pid
+PROCESS=@sbindir@/virtlockd +PROCESS=@sbindir@/virtlockd
PIDFILE=@localstatedir@/run/libvirt/lockd/$SERVICE.pid +PIDDIR=@localstatedir@/run/libvirt/lockd/
+PIDFILE=$PIDDIR/$SERVICE.pid
VIRTLOCKD_ARGS= VIRTLOCKD_ARGS=
@ -58,7 +60,8 @@ Index: libvirt-1.1.2/src/locking/virtlockd.init.in
- echo -n $"Starting $SERVICE daemon: " - echo -n $"Starting $SERVICE daemon: "
- daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $VIRTLOCKD_ARGS - daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $VIRTLOCKD_ARGS
+ echo -n $"Starting $SERVICE " + echo -n $"Starting $SERVICE "
+ startproc $PROCESS --daemon $VIRTLOCKD_ARGS + test -d $PIDDIR || mkdir -p $PIDDIR
+ startproc -p $PIDFILE $PROCESS --pid-file $PIDFILE --daemon $VIRTLOCKD_ARGS
RETVAL=$? RETVAL=$?
- echo - echo
- [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE - [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
@ -79,7 +82,7 @@ Index: libvirt-1.1.2/src/locking/virtlockd.init.in
rm -f $PIDFILE rm -f $PIDFILE
fi fi
} }
@@ -65,9 +63,7 @@ reload() { @@ -65,9 +65,7 @@ reload() {
echo -n $"Reloading $SERVICE configuration: " echo -n $"Reloading $SERVICE configuration: "
killproc -p $PIDFILE $PROCESS -HUP killproc -p $PIDFILE $PROCESS -HUP
@ -90,7 +93,7 @@ Index: libvirt-1.1.2/src/locking/virtlockd.init.in
} }
# See how we were called. # See how we were called.
@@ -76,18 +72,20 @@ case "$1" in @@ -76,18 +74,20 @@ case "$1" in
$1 $1
;; ;;
status) status)
@ -105,7 +108,7 @@ Index: libvirt-1.1.2/src/locking/virtlockd.init.in
;; ;;
condrestart|try-restart) condrestart|try-restart)
- [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || : - [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || :
+ status >/dev/null && restart || : + $0 status >/dev/null && restart || :
;; ;;
*) *)
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}" echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"