External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virt-aa-helper, apparmor: allow /usr/share/OVMF/ too

Browse Source 
The split firmware and variables files introduced by
https://bugs.debian.org/764918 are in a different directory for
some reason. Let the virtual machine read both.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Simon McVittie 2017-05-23 18:22:39 +02:00 committed by Guido Günther
parent 307a205e25
commit 8d4aad6412
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/apparmor/libvirt-qemu
View File

@ -70,6 +70,7 @@
/usr/share/vgabios/** r, /usr/share/vgabios/** r,
/usr/share/seabios/** r, /usr/share/seabios/** r,
/usr/share/ovmf/** r, /usr/share/ovmf/** r,
/usr/share/OVMF/** r,
# access PKI infrastructure # access PKI infrastructure
/etc/pki/libvirt-vnc/** r, /etc/pki/libvirt-vnc/** r,

1
src/security/virt-aa-helper.c
View File

@ -512,6 +512,7 @@ valid_path(const char *path, const bool readonly)
"/vmlinuz", "/vmlinuz",
"/initrd", "/initrd",
"/initrd.img", "/initrd.img",
"/usr/share/OVMF/", /* for OVMF images */
"/usr/share/ovmf/" /* for OVMF images */ "/usr/share/ovmf/" /* for OVMF images */
}; };
/* override the above with these */ /* override the above with these */

7
tests/virt-aa-helper-test
View File

@ -296,8 +296,13 @@ if [ -f /usr/share/ovmf/OVMF.fd ]; then
-e "s,###DISK###,$disk1,g" \ -e "s,###DISK###,$disk1,g" \
-e "s,</os>,<loader readonly='yes' type='pflash'>/usr/share/ovmf/OVMF.fd</loader></os>,g" "$template_xml" > "$test_xml" -e "s,</os>,<loader readonly='yes' type='pflash'>/usr/share/ovmf/OVMF.fd</loader></os>,g" "$template_xml" > "$test_xml"
testme "0" "ovmf" "-r -u $valid_uuid" "$test_xml" testme "0" "ovmf" "-r -u $valid_uuid" "$test_xml"
elif [ -f /usr/share/OVMF/OVMF.fd ]; then
sed -e "s,###UUID###,$uuid,g" \
-e "s,###DISK###,$disk1,g" \
-e "s,</os>,<loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF.fd</loader></os>,g" "$template_xml" > "$test_xml"
testme "0" "ovmf" "-r -u $valid_uuid" "$test_xml"
else else
echo "Skipping OVMF test. Could not find /usr/share/ovmf/OVMF.fd" echo "Skipping OVMF test. Could not find /usr/share/ovmf/OVMF.fd or /usr/share/OVMF/OVMF.fd"
fi fi
sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</os>,<initrd>$tmpdir/initrd</initrd></os>,g" "$template_xml" > "$test_xml" sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</os>,<initrd>$tmpdir/initrd</initrd></os>,g" "$template_xml" > "$test_xml"