diff -Nru libvirt-1.2.16/debian/changelog libvirt-1.2.16/debian/changelog --- libvirt-1.2.16/debian/changelog 2015-08-12 04:22:28.000000000 +0000 +++ libvirt-1.2.16/debian/changelog 2015-08-14 13:46:35.000000000 +0000 @@ -1,3 +1,11 @@ +libvirt (1.2.16-2ubuntu8) wily; urgency=medium + + * Support OVMF images in virt-aa-helper. (LP: #1483071) + * Fix the libvirt-bin.preinst to not stop libvirt-bin on upgrade + from 1.2.16-2ubuntu7. + + -- Serge Hallyn Fri, 14 Aug 2015 07:34:30 -0500 + libvirt (1.2.16-2ubuntu7) wily; urgency=medium * Stop libvirt-bin at pre-inst if upgrading from a non-systemd version, diff -Nru libvirt-1.2.16/debian/libvirt-bin.preinst libvirt-1.2.16/debian/libvirt-bin.preinst --- libvirt-1.2.16/debian/libvirt-bin.preinst 2015-08-12 03:00:57.000000000 +0000 +++ libvirt-1.2.16/debian/libvirt-bin.preinst 2015-08-14 13:38:47.000000000 +0000 @@ -13,7 +13,7 @@ # Stop libvirt if we are switching to systemd # remove this after 16.10 release WASRUNNING="/run/libvirt/wasrunning" - if [ -n "$2" ] && dpkg --compare-versions "$2" le 1.2.16-2ubuntu7; then + if [ -n "$2" ] && dpkg --compare-versions "$2" le 1.2.16-2ubuntu6; then if service libvirt-bin status > /dev/null 2>&1; then service libvirt-bin stop touch "$WASRUNNING" diff -Nru libvirt-1.2.16/debian/patches/series libvirt-1.2.16/debian/patches/series --- libvirt-1.2.16/debian/patches/series 2015-07-10 20:14:14.000000000 +0000 +++ libvirt-1.2.16/debian/patches/series 2015-08-14 12:40:06.000000000 +0000 @@ -27,3 +27,4 @@ 9040-virt-aa-helper-add-unix-channels.patch storage-allow-zero-capacity-with-non-backing-file-to.patch tests-add-vol-qcow2-zerocapacity-test-to-storagevolx.patch +virt-aa-helper-handle-ovmf diff -Nru libvirt-1.2.16/debian/patches/virt-aa-helper-handle-ovmf libvirt-1.2.16/debian/patches/virt-aa-helper-handle-ovmf --- libvirt-1.2.16/debian/patches/virt-aa-helper-handle-ovmf 1970-01-01 00:00:00.000000000 +0000 +++ libvirt-1.2.16/debian/patches/virt-aa-helper-handle-ovmf 2015-08-14 12:40:24.000000000 +0000 @@ -0,0 +1,14 @@ +Index: libvirt-1.2.16/src/security/virt-aa-helper.c +=================================================================== +--- libvirt-1.2.16.orig/src/security/virt-aa-helper.c ++++ libvirt-1.2.16/src/security/virt-aa-helper.c +@@ -572,7 +572,8 @@ valid_path(const char *path, const bool + /* override the above with these */ + const char * const override[] = { + "/sys/devices/pci", /* for hostdev pci devices */ +- "/etc/libvirt-sandbox/services/" /* for virt-sandbox service config */ ++ "/etc/libvirt-sandbox/services/", /* for virt-sandbox service config */ ++ "/usr/share/ovmf/" /* for OVMF images */ + }; + + if (path == NULL) {