SHA256
1
0
forked from pool/libvirt
libvirt/suse-libvirt-guests-service.patch
James Fehlig d0be6a8d16 Accepting request 907179 from home:jfehlig:branches:Virtualization
- spec: Don't forcibly remove '--listen' arg from
  /etc/sysconfig/libvirtd. Add '--timeout 120' if '--listen' is
  not specified.
  bsc#1188232
- spec: Remove the sysconfig fillup files for the various daemons
  - Dropped patches:
    suse-libvirtd-sysconfig-settings.patch,
    suse-virtlockd-sysconfig-settings.patch,
    suse-virtlogd-sysconfig-settings.patch

- spec: Add bash-completion dependency to libvirt-daemon and
  libvirt-client. It was mistakenly dropped when
  libvirt-bash-completion was merged into the daemon and client
  subpackages

- qemu: Use correct flag constant for enabling storage migration
  f58349c9-qemu-storage-migration.patch
  bsc#1188171

OBS-URL: https://build.opensuse.org/request/show/907179
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=897
2021-07-19 17:36:51 +00:00

31 lines
1.0 KiB
Diff

Adjust libvirt-guests service to conform to SUSE standards
Index: libvirt-7.5.0/tools/libvirt-guests.sh.in
===================================================================
--- libvirt-7.5.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-7.5.0/tools/libvirt-guests.sh.in
@@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@"
localstatedir="@localstatedir@"
libvirtd="@sbindir@"/libvirtd
-# Source function library.
-test ! -r "$sysconfdir"/rc.d/init.d/functions ||
- . "$sysconfdir"/rc.d/init.d/functions
-
# Source gettext library.
# Make sure this file is recognized as having translations: _("dummy")
. "@bindir@"/gettext.sh
@@ -43,7 +39,11 @@ test -f "$sysconfdir"/sysconfig/libvirt-
. "$sysconfdir"/sysconfig/libvirt-guests
LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
+if [ -d "$localstatedir"/lock/subsys ]; then
+ VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
+else
+ VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
+fi
RETVAL=0