Rediff patches
Guido Günther
7 years ago
8 | 8 |
2 files changed, 2 insertions(+), 4 deletions(-)
|
9 | 9 |
|
10 | 10 |
diff --git a/src/Makefile.am b/src/Makefile.am
|
11 | |
index 314f6df..82afbad 100644
|
|
11 |
index 12b66c2..d49749a 100644
|
12 | 12 |
--- a/src/Makefile.am
|
13 | 13 |
+++ b/src/Makefile.am
|
14 | 14 |
@@ -3092,8 +3092,7 @@ if WITH_NETWORK
|
|
22 | 22 |
|
23 | 23 |
uninstall-local:: uninstall-init uninstall-systemd
|
24 | 24 |
diff --git a/src/Makefile.in b/src/Makefile.in
|
25 | |
index 5d2311f..bbc7914 100644
|
|
25 |
index d923b7a..4dadea7 100644
|
26 | 26 |
--- a/src/Makefile.in
|
27 | 27 |
+++ b/src/Makefile.in
|
28 | |
@@ -11319,8 +11319,7 @@ install-data-local: install-init install-systemd
|
|
28 |
@@ -11321,8 +11321,7 @@ install-data-local: install-init install-systemd
|
29 | 29 |
@WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
|
30 | 30 |
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
|
31 | 31 |
@WITH_NETWORK_TRUE@ ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
|
6 | 6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
7 | 7 |
|
8 | 8 |
diff --git a/tools/virsh.pod b/tools/virsh.pod
|
9 | |
index 90ab47d..c633399 100644
|
|
9 |
index 6844823..d4fe18f 100644
|
10 | 10 |
--- a/tools/virsh.pod
|
11 | 11 |
+++ b/tools/virsh.pod
|
12 | 12 |
@@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
|
41 | 41 |
1 file changed, 9 insertions(+), 1 deletion(-)
|
42 | 42 |
|
43 | 43 |
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
|
44 | |
index ccae02f..250d4fc 100644
|
|
44 |
index 28a6e1b..91a1111 100644
|
45 | 45 |
--- a/src/qemu/qemu_monitor_text.c
|
46 | 46 |
+++ b/src/qemu/qemu_monitor_text.c
|
47 | 47 |
@@ -1465,7 +1465,15 @@ int qemuMonitorTextGetMigrationStats(qemuMonitorPtr mon,
|
23 | 23 |
# access PKI infrastructure
|
24 | 24 |
/etc/pki/libvirt-vnc/** r,
|
25 | 25 |
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
|
26 | |
index 7eeb4ef..a445a61 100644
|
|
26 |
index 691bbdf..ecb9e12 100644
|
27 | 27 |
--- a/src/security/virt-aa-helper.c
|
28 | 28 |
+++ b/src/security/virt-aa-helper.c
|
29 | |
@@ -570,6 +570,7 @@ valid_path(const char *path, const bool readonly)
|
|
29 |
@@ -512,6 +512,7 @@ valid_path(const char *path, const bool readonly)
|
30 | 30 |
"/vmlinuz",
|
31 | 31 |
"/initrd",
|
32 | 32 |
"/initrd.img",
|