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

Rebase patches

parent 581b8142
No related branches found
No related tags found
No related merge requests found
......@@ -12,10 +12,10 @@ to not interfere with existing network configurations
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index e40909b..022a4ce 100644
index 2309984..a197759 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1638,9 +1638,6 @@ if WITH_NETWORK
@@ -1639,9 +1639,6 @@ if WITH_NETWORK
cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
......@@ -26,10 +26,10 @@ index e40909b..022a4ce 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
index f0d673b..7eb9e65 100644
index 9f48cf6..1f21b0b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -7684,9 +7684,6 @@ install-data-local:
@@ -7694,9 +7694,6 @@ install-data-local:
@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
......
......@@ -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 f83a29d..bd495b4 100644
index 93fdac7..1aa4015 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -104,7 +104,7 @@ alphabetic character, @, [, ], \, ^, _.
......
......@@ -26,10 +26,10 @@ Otherwise this results in crashes like:
1 file changed, 3 insertions(+)
diff --git a/tools/virsh.c b/tools/virsh.c
index 567a5f6..ce8b9bf 100644
index a783f47..7221bf3 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -20097,6 +20097,9 @@ vshInit(vshControl *ctl)
@@ -20289,6 +20289,9 @@ vshInit(vshControl *ctl)
/* set up the signals handlers to catch disconnections */
vshSetupSignals();
......
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