58112c5e1b
- Update to libvirt 8.7.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-7-0-2022-09-01 - Dropped patches: 9493c9b7-lxc-containter-fix-build-with-glibc-2.36.patch, c0d9adf2-virfile-Fix-build-with-glibc-2.36.patch - spec: Suppress error messages about nonexistent or unreadable files from grep OBS-URL: https://build.opensuse.org/request/show/1000754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=943
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From b447f2a3042a206bebb897874af20fdd7d897347 Mon Sep 17 00:00:00 2001
|
|
From: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Tue, 5 Jul 2022 11:41:58 -0600
|
|
Subject: Adjust libvirt-guests service to conform to SUSE standards
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
---
|
|
tools/libvirt-guests.sh.in | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
Index: libvirt-8.7.0/tools/libvirt-guests.sh.in
|
|
===================================================================
|
|
--- libvirt-8.7.0.orig/tools/libvirt-guests.sh.in
|
|
+++ libvirt-8.7.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
|
|
|