diff --git a/bz2138823-fence_virtd-update-manpage.patch b/bz2138823-fence_virtd-update-manpage.patch new file mode 100644 index 0000000..076992d --- /dev/null +++ b/bz2138823-fence_virtd-update-manpage.patch @@ -0,0 +1,29 @@ +From 6817d9ff018aa1af6fb9775bc9ae1f1cc07fa1ea Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Mon, 31 Oct 2022 10:54:10 +0100 +Subject: [PATCH] fence_virtd: add link and non-user socket example to man page + +--- + agents/virt/man/fence_virt.conf.5 | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/agents/virt/man/fence_virt.conf.5 b/agents/virt/man/fence_virt.conf.5 +index c23ffd943..c8434ed65 100644 +--- a/agents/virt/man/fence_virt.conf.5 ++++ b/agents/virt/man/fence_virt.conf.5 +@@ -230,6 +230,15 @@ by a user running a cluster of virtual machines on a single desktop computer. + . + the URI to use when connecting to libvirt. + ++All libvirt URIs are accepted and passed as-is. ++ ++See https://libvirt.org/uri.html#remote-uris for examples. ++ ++NOTE: When VMs are run as non-root user the socket path must be set as part ++of the URI. ++ ++Example: qemu:///session?socket=/run/user//libvirt/virtqemud-sock ++ + .SS libvirt-qmf + + The libvirt-qmf plugin acts as a QMFv2 Console to the libvirt-qmf daemon in diff --git a/fence-agents.spec b/fence-agents.spec index edff1ae..6318340 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -59,7 +59,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 35%{?alphatag:.%{alphatag}}%{?dist} +Release: 36%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz @@ -224,6 +224,7 @@ Patch29: bz2111998-fence_ibm_vpc-add-token-cache-support.patch Patch30: bz2132008-fence_virt-add-note-reboot-action.patch Patch31: bz2134015-fence_lpar-only-output-additional-info-on-debug.patch Patch32: bz2136191-fence_ibm_powervs-improve-defaults.patch +Patch33: bz2138823-fence_virtd-update-manpage.patch %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump kubevirt lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti %ifarch x86_64 @@ -367,6 +368,7 @@ BuildRequires: %{systemd_units} %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1433,6 +1435,11 @@ are located on corosync cluster nodes. %endif %changelog +* Mon Oct 31 2022 Oyvind Albrigtsen - 4.10.0-36 +- fence_virtd: add link to uri examples and uri w/socket path + example for when VMS are run as non-root user to manpage + Resolves: rhbz#2138823 + * Tue Oct 25 2022 Oyvind Albrigtsen - 4.10.0-35 - fence_ibm_powervs: improve defaults Resolves: rhbz#2136191