diff --git a/community/libvirt/APKBUILD b/community/libvirt/APKBUILD index 294c7b3174f503e67af6b177256bb1c2824d3926..99da85917fd2b0f3e8376d8596e8ec457eb00cec 100644 --- a/community/libvirt/APKBUILD +++ b/community/libvirt/APKBUILD @@ -2,7 +2,7 @@ pkgname=libvirt pkgver=10.7.0 _ver="${pkgver/_rc/-rc}" -pkgrel=0 +pkgrel=1 pkgdesc="Virtualization API for several hypervisor and container systems" url="https://libvirt.org/" arch="all" @@ -79,6 +79,7 @@ source="https://libvirt.org/sources/libvirt-$pkgver.tar.xz libvirt-guests.initd virtlogd.initd virtlockd.initd + revert-script-virsh-uuid.patch " if [ "$CARCH" = "x86_64" ]; then subpackages="$subpackages $pkgname-xen" @@ -220,4 +221,5 @@ c3647366e589f2134599baefcbd7ec480cbc0830c71f95cd903cacb28e463d4cd8d972fbd1db81aa ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0 libvirt-guests.initd f93313c387c21bafb760f599942f1cdecfe952af80af42a28e8525118e5a7fd512d9f909039d8b15f1a544957f1d70a0728c55de2bae41a87e5be6dbbb4f6208 virtlogd.initd d8ef64d76e8be521a6551893cc7c6aa7e5d8c627a9aed87beefefc126798dc0f98bf420609b6afc027ad96cca347a1c5db8f703d09853efde4d1a6a35572fbf1 virtlockd.initd +d9686f9fad634feb75abce73245302ad85319f27707647af3434f3af7799511afe575ce6b0f80330569fe8aab2b8fe2f4bc31159317789ad6138a318bf7e7250 revert-script-virsh-uuid.patch " diff --git a/community/libvirt/revert-script-virsh-uuid.patch b/community/libvirt/revert-script-virsh-uuid.patch new file mode 100644 index 0000000000000000000000000000000000000000..186aaf8f79eeb11d6e46e1f243c9be70c14a8677 --- /dev/null +++ b/community/libvirt/revert-script-virsh-uuid.patch @@ -0,0 +1,51 @@ +From 008214842011d77fa4feda8d1ff586d29791f8ab Mon Sep 17 00:00:00 2001 +From: Peter Krempa <pkrempa@redhat.com> +Date: Thu, 5 Sep 2024 14:17:38 +0200 +Subject: [PATCH] virsh: cmdList: Revert to script-friendly output for 'virsh + list --uuid' + +Commit 271940223c2914bf63cbec00930ce46d6eef30ba which strived to add +support to use '--uuid' in the table output of 'virsh list' went too far +and also allowed the default table view to be enabled when just '--uuid' +is specified. + +This broke the script-friendly output which previously had this format: + + $ virsh list --uuid + b6d03c07-86f8-4a57-8719-172a5d0359bb + +to this script-unfriendly output: + + $ virsh list --uuid + Id Name State UUID + ------------------------------------------------------------- + 1 ha running b6d03c07-86f8-4a57-8719-172a5d0359bb + +Using the human friendly output will still be possible by using: + + $ virsh list --table --uuid + +Fixes: 271940223c2914bf63cbec00930ce46d6eef30ba +Closes: https://gitlab.com/libvirt/libvirt/-/issues/666 +Signed-off-by: Peter Krempa <pkrempa@redhat.com> +Reviewed-by: Jiri Denemark <jdenemar@redhat.com> +--- + tools/virsh-domain-monitor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c +index 87efd86a69..9ee9090c11 100644 +--- a/tools/virsh-domain-monitor.c ++++ b/tools/virsh-domain-monitor.c +@@ -1857,7 +1857,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) + VSH_EXCLUSIVE_OPTIONS("table", "name"); + VSH_EXCLUSIVE_OPTIONS("table", "id"); + +- if (!optName && !optID) ++ if (!optUUID && !optName && !optID) + optTable = true; + + if (!(list = virshDomainListCollect(ctl, flags))) +-- +GitLab +