pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix botched backport

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=970
This commit is contained in:
James Fehlig 2023-03-02 23:40:48 +00:00 committed by Git OBS Bridge
parent e0dc60b804
commit 997b4043d9
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
4959490e-support-SUSE-edk2-firmware-paths.patch
View File

@ -1,4 +1,4 @@
From 4959490ed1356b8779868cfe16775ef5aef3cab7 Mon Sep 17 00:00:00 2001 From f49281168b3201d0ffe731554a49923914b0e67c Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig@suse.com> From: Jim Fehlig <jfehlig@suse.com>
Date: Thu, 23 Feb 2023 11:02:46 -0700 Date: Thu, 23 Feb 2023 11:02:46 -0700
Subject: [PATCH] security: Add support for SUSE edk2 firmware paths Subject: [PATCH] security: Add support for SUSE edk2 firmware paths
@ -16,10 +16,10 @@ Reviewed-by: Andrea Bolognani <abologna@redhat.com>
src/security/virt-aa-helper.c | 1 + src/security/virt-aa-helper.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu Index: libvirt-9.1.0/src/security/apparmor/libvirt-qemu
index 8e4c3ab808..91dc8aacf8 100644 ===================================================================
--- a/src/security/apparmor/libvirt-qemu --- libvirt-9.1.0.orig/src/security/apparmor/libvirt-qemu
+++ b/src/security/apparmor/libvirt-qemu +++ libvirt-9.1.0/src/security/apparmor/libvirt-qemu
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
/usr/share/proll/** r, /usr/share/proll/** r,
/usr/share/qemu-efi/** r, /usr/share/qemu-efi/** r,
@ -29,18 +29,15 @@ index 8e4c3ab808..91dc8aacf8 100644
/usr/share/seabios/** r, /usr/share/seabios/** r,
/usr/share/sgabios/** r, /usr/share/sgabios/** r,
/usr/share/slof/** r, /usr/share/slof/** r,
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c Index: libvirt-9.1.0/src/security/virt-aa-helper.c
index 6401690f5a..49a9ee9db8 100644 ===================================================================
--- a/src/security/virt-aa-helper.c --- libvirt-9.1.0.orig/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c +++ libvirt-9.1.0/src/security/virt-aa-helper.c
@@ -481,6 +481,7 @@ valid_path(const char *path, const bool readonly) @@ -481,6 +481,7 @@ valid_path(const char *path, const bool
"/usr/share/AAVMF/", /* for AAVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */
"/usr/share/qemu-efi/", /* for AAVMF images */ "/usr/share/qemu-efi/", /* for AAVMF images */
"/usr/share/qemu-efi-aarch64/", /* for AAVMF images */ "/usr/share/qemu-efi-aarch64/", /* for AAVMF images */
+ "/usr/share/qemu/", /* SUSE path for OVMF and AAVMF images */ + "/usr/share/qemu/", /* SUSE path for OVMF and AAVMF images */
"/usr/lib/u-boot/", /* u-boot loaders for qemu */ "/usr/lib/u-boot/", /* u-boot loaders for qemu */
"/usr/lib/riscv64-linux-gnu/opensbi" /* RISC-V SBI implementation */ "/usr/lib/riscv64-linux-gnu/opensbi" /* RISC-V SBI implementation */
"/usr/share/qemu/" /* SUSE path for OVMF and AAVMF images */ };
--
2.39.2

14
suse-qemu-ovmf-paths.patch
View File

@ -70,17 +70,3 @@ Index: libvirt-9.1.0/src/qemu/test_libvirtd_qemu.aug.in
} }
{ "stdio_handler" = "logd" } { "stdio_handler" = "logd" }
{ "gluster_debug_level" = "9" } { "gluster_debug_level" = "9" }
Index: libvirt-9.1.0/src/security/virt-aa-helper.c
===================================================================
--- libvirt-9.1.0.orig/src/security/virt-aa-helper.c
+++ libvirt-9.1.0/src/security/virt-aa-helper.c
@@ -482,7 +482,8 @@ valid_path(const char *path, const bool
"/usr/share/qemu-efi/", /* for AAVMF images */
"/usr/share/qemu-efi-aarch64/", /* for AAVMF images */
"/usr/lib/u-boot/", /* u-boot loaders for qemu */
- "/usr/lib/riscv64-linux-gnu/opensbi" /* RISC-V SBI implementation */
+ "/usr/lib/riscv64-linux-gnu/opensbi", /* RISC-V SBI implementation */
+ "/usr/share/qemu/" /* SUSE path for OVMF and AAVMF images */
};
/* override the above with these */
const char * const override[] = {