938f073a9b
- CVE-2015-5313: don't allow '/' in filesystem volume names
034e47c3-CVE-2015-5313.patch
bsc#953110
- Fix failing qemuxml2argv test on 32-bit platforms
ace1ee22-qemuxml2argv-test.patch
- Update to libvirt 1.3.0
- New virtlogd log daemon
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patch: 703ec1b7-qemu-bridge-helper-fix.patch
- Added patch: virtlogd-init-script.patch
OBS-URL: https://build.opensuse.org/request/show/349565
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=505
124 lines
3.4 KiB
Diff
124 lines
3.4 KiB
Diff
Adjust virtlockd init files to conform to SUSE standards
|
|
|
|
Index: libvirt-1.3.0/src/locking/virtlockd.sysconf
|
|
===================================================================
|
|
--- libvirt-1.3.0.orig/src/locking/virtlockd.sysconf
|
|
+++ libvirt-1.3.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-1.3.0/src/locking/virtlockd.init.in
|
|
===================================================================
|
|
--- libvirt-1.3.0.orig/src/locking/virtlockd.init.in
|
|
+++ libvirt-1.3.0/src/locking/virtlockd.init.in
|
|
@@ -4,12 +4,14 @@
|
|
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
|
|
#
|
|
### BEGIN INIT INFO
|
|
-# Provides: virtlockd
|
|
-# Default-Start:
|
|
-# Default-Stop: 0 1 2 3 4 5 6
|
|
+# Provides: virtlockd
|
|
+# Required-Start: $network $remote_fs
|
|
+# Default-Start: 3 5
|
|
+# Required-Stop: $network $remote_fs
|
|
+# Default-Stop: 0 1 2 4 6
|
|
# 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
|
|
@@ -24,35 +26,33 @@
|
|
# 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
|
|
}
|
|
@@ -66,9 +66,7 @@ reload() {
|
|
echo -n $"Reloading $SERVICE configuration: "
|
|
|
|
killproc -p $PIDFILE $PROCESS -USR1
|
|
- RETVAL=$?
|
|
- echo
|
|
- return $RETVAL
|
|
+ rc_status
|
|
}
|
|
|
|
# See how we were called.
|
|
@@ -77,18 +75,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
|