diff --git a/4959490e-support-SUSE-edk2-firmware-paths.patch b/4959490e-support-SUSE-edk2-firmware-paths.patch index 1deeef2..dd45d4a 100644 --- a/4959490e-support-SUSE-edk2-firmware-paths.patch +++ b/4959490e-support-SUSE-edk2-firmware-paths.patch @@ -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 Date: Thu, 23 Feb 2023 11:02:46 -0700 Subject: [PATCH] security: Add support for SUSE edk2 firmware paths @@ -16,10 +16,10 @@ Reviewed-by: Andrea Bolognani src/security/virt-aa-helper.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu -index 8e4c3ab808..91dc8aacf8 100644 ---- a/src/security/apparmor/libvirt-qemu -+++ b/src/security/apparmor/libvirt-qemu +Index: libvirt-9.1.0/src/security/apparmor/libvirt-qemu +=================================================================== +--- libvirt-9.1.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-9.1.0/src/security/apparmor/libvirt-qemu @@ -91,7 +91,7 @@ /usr/share/proll/** r, /usr/share/qemu-efi/** r, @@ -29,18 +29,15 @@ index 8e4c3ab808..91dc8aacf8 100644 /usr/share/seabios/** r, /usr/share/sgabios/** r, /usr/share/slof/** r, -diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c -index 6401690f5a..49a9ee9db8 100644 ---- a/src/security/virt-aa-helper.c -+++ b/src/security/virt-aa-helper.c -@@ -481,6 +481,7 @@ valid_path(const char *path, const bool readonly) +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 +@@ -481,6 +481,7 @@ valid_path(const char *path, const bool "/usr/share/AAVMF/", /* for AAVMF images */ "/usr/share/qemu-efi/", /* for AAVMF images */ "/usr/share/qemu-efi-aarch64/", /* for AAVMF images */ + "/usr/share/qemu/", /* SUSE path for OVMF and AAVMF images */ "/usr/lib/u-boot/", /* u-boot loaders for qemu */ "/usr/lib/riscv64-linux-gnu/opensbi" /* RISC-V SBI implementation */ - "/usr/share/qemu/" /* SUSE path for OVMF and AAVMF images */ --- -2.39.2 - + }; diff --git a/suse-qemu-ovmf-paths.patch b/suse-qemu-ovmf-paths.patch index 7769f5c..ba9b506 100644 --- a/suse-qemu-ovmf-paths.patch +++ b/suse-qemu-ovmf-paths.patch @@ -70,17 +70,3 @@ Index: libvirt-9.1.0/src/qemu/test_libvirtd_qemu.aug.in } { "stdio_handler" = "logd" } { "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[] = {