forked from pool/libvirt
2aa2eef142
- Update to libvirt 3.4.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
aeda1b8c-qemu-no-error-shutdown.patch,
8023b21a-conf-ioapic.patch, 6b5c6314-qemu-irqchip.patch,
2020e2c6-conf-intremap.patch, 04028a9d-qemu-intremap.patch,
d12781b4-conf-iommu-cache-mode-attr.patch,
a5691448-qemu-iommu-cache-mode.patch,
3a276c65-conf-iommu-def-stability-check.patch,
935d927a-conf-iommu-ABI-stability-check.patch,
4cd3f241-fix-NULL-disk-source.patch,
975ea20f-loopback-macro.patch,
dbb85e0c-libxl-graphics-listen-addr.patch,
libxl-def-usbctrl.patch, revert-2841e675-mtu.patch
- FATE#321335, bsc#1031056, bsc#1037774, bsc#1040207, bsc#1040213
OBS-URL: https://build.opensuse.org/request/show/500763
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=606
143 lines
4.0 KiB
Diff
143 lines
4.0 KiB
Diff
Adjust virtlockd init files to conform to SUSE standards
|
|
|
|
Index: libvirt-3.4.0/src/locking/virtlockd.sysconf
|
|
===================================================================
|
|
--- libvirt-3.4.0.orig/src/locking/virtlockd.sysconf
|
|
+++ libvirt-3.4.0/src/locking/virtlockd.sysconf
|
|
@@ -1,3 +1,7 @@
|
|
+## Path: System/Virtualization/virtlockd
|
|
+
|
|
+## Type: string
|
|
+## Default: ""
|
|
#
|
|
# Pass extra arguments to virtlockd
|
|
#VIRTLOCKD_ARGS=
|
|
Index: libvirt-3.4.0/src/locking/virtlockd.init.in
|
|
===================================================================
|
|
--- libvirt-3.4.0.orig/src/locking/virtlockd.init.in
|
|
+++ libvirt-3.4.0/src/locking/virtlockd.init.in
|
|
@@ -4,59 +4,57 @@
|
|
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
|
|
#
|
|
### BEGIN INIT INFO
|
|
-# Provides: virtlockd
|
|
-# Default-Start: 3 4 5
|
|
-# Default-Stop: 0 1 2 6
|
|
-# Required-Start:
|
|
-# Required-Stop:
|
|
-# Should-Start: $network $remote_fs
|
|
-# Should-Stop: $network $remote_fs
|
|
+# Provides: virtlockd
|
|
+# Required-Start: $network $remote_fs
|
|
+# Required-Stop: $network $remote_fs
|
|
+# Default-Start: 3 5
|
|
+# Default-Stop: 0 1 2 4 6
|
|
+# Should-Start:
|
|
+# Should-Stop:
|
|
# Short-Description: virtual machine lock manager
|
|
-# Description: This is a daemon for managing locks
|
|
-# on virtual machine disk images
|
|
+# Description: This is a daemon for managing locks
|
|
+# on virtual machine disk images
|
|
### END INIT INFO
|
|
|
|
# the following is chkconfig init header
|
|
#
|
|
-# virtlockd: virtual machine lock manager
|
|
+# virtlockd: virtual machine lock manager
|
|
#
|
|
-# chkconfig: 345 96 04
|
|
-# description: This is a daemon for managing locks \
|
|
-# on virtual machine disk images
|
|
+# chkconfig: 345 96 04
|
|
+# description: This is a daemon for managing locks \
|
|
+# on virtual machine disk images
|
|
#
|
|
-# processname: virtlockd
|
|
-# pidfile: @localstatedir@/run/virtlockd.pid
|
|
+# processname: virtlockd
|
|
+# pidfile: @localstatedir@/run/virtlockd.pid
|
|
#
|
|
|
|
-# Source function library.
|
|
-. @sysconfdir@/rc.d/init.d/functions
|
|
+. @sysconfdir@/rc.status
|
|
+rc_reset
|
|
|
|
SERVICE=virtlockd
|
|
-PROCESS=virtlockd
|
|
-PIDFILE=@localstatedir@/run/$SERVICE.pid
|
|
+PROCESS=@sbindir@/virtlockd
|
|
+PIDDIR=@localstatedir@/run/libvirt/lockd/
|
|
+PIDFILE=$PIDDIR/$SERVICE.pid
|
|
|
|
VIRTLOCKD_ARGS=
|
|
|
|
test -f @sysconfdir@/sysconfig/virtlockd && . @sysconfdir@/sysconfig/virtlockd
|
|
|
|
-RETVAL=0
|
|
-
|
|
start() {
|
|
- echo -n $"Starting $SERVICE daemon: "
|
|
- daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $VIRTLOCKD_ARGS
|
|
+ echo -n $"Starting $SERVICE "
|
|
+ test -d $PIDDIR || mkdir -p $PIDDIR
|
|
+ startproc -p $PIDFILE $PROCESS --pid-file $PIDFILE --daemon $VIRTLOCKD_ARGS
|
|
RETVAL=$?
|
|
- echo
|
|
- [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
|
|
+ rc_status -v
|
|
}
|
|
|
|
stop() {
|
|
- echo -n $"Stopping $SERVICE daemon: "
|
|
+ echo -n $"Stopping $SERVICE "
|
|
|
|
- killproc -p $PIDFILE $PROCESS
|
|
+ killproc -p $PIDFILE $PROCESS > /dev/null 2>&1
|
|
RETVAL=$?
|
|
- echo
|
|
+ rc_status -v
|
|
if [ $RETVAL -eq 0 ]; then
|
|
- rm -f @localstatedir@/lock/subsys/$SERVICE
|
|
rm -f $PIDFILE
|
|
fi
|
|
}
|
|
@@ -70,9 +68,7 @@ reload() {
|
|
echo -n $"Reloading $SERVICE configuration: "
|
|
|
|
killproc -p $PIDFILE $PROCESS -USR1
|
|
- RETVAL=$?
|
|
- echo
|
|
- return $RETVAL
|
|
+ rc_status
|
|
}
|
|
|
|
# See how we were called.
|
|
@@ -81,18 +77,20 @@ case "$1" in
|
|
$1
|
|
;;
|
|
status)
|
|
- status -p $PIDFILE $PROCESS
|
|
- RETVAL=$?
|
|
+ echo -n "Checking status of $SERVICE "
|
|
+ checkproc $PROCESS
|
|
+ rc_status -v
|
|
;;
|
|
force-reload)
|
|
reload
|
|
;;
|
|
condrestart|try-restart)
|
|
- [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || :
|
|
+ $0 status >/dev/null && restart || :
|
|
;;
|
|
*)
|
|
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"
|
|
- exit 2
|
|
+ rc_failed 2
|
|
+ rc_exit
|
|
;;
|
|
esac
|
|
-exit $RETVAL
|
|
+rc_exit
|