Skip to content
Snippets Groups Projects
Commit 42187709 authored by Guido Günther's avatar Guido Günther
Browse files

Rediff patches

parent 40daacf0
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@ to not interfere with existing network configurations
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 314f6df..82afbad 100644
index 12b66c2..d49749a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3092,8 +3092,7 @@ if WITH_NETWORK
......@@ -23,10 +23,10 @@ index 314f6df..82afbad 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
index 5d2311f..bbc7914 100644
index d923b7a..4dadea7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -11319,8 +11319,7 @@ install-data-local: install-init install-systemd
@@ -11321,8 +11321,7 @@ install-data-local: install-init install-systemd
@WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@WITH_NETWORK_TRUE@ ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
......
......@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 90ab47d..c633399 100644
index 6844823..d4fe18f 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
......
......@@ -42,7 +42,7 @@ to savely detect that the command 'info migrate' is not implemented.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index ccae02f..250d4fc 100644
index 28a6e1b..91a1111 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1465,7 +1465,15 @@ int qemuMonitorTextGetMigrationStats(qemuMonitorPtr mon,
......
......@@ -24,10 +24,10 @@ index efb4873..9f996ab 100644
# access PKI infrastructure
/etc/pki/libvirt-vnc/** r,
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 7eeb4ef..a445a61 100644
index 691bbdf..ecb9e12 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -570,6 +570,7 @@ valid_path(const char *path, const bool readonly)
@@ -512,6 +512,7 @@ valid_path(const char *path, const bool readonly)
"/vmlinuz",
"/initrd",
"/initrd.img",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment