Rebase patches
Guido Günther
12 years ago
7 | 7 | 2 files changed, 10 insertions(+), 5 deletions(-) |
8 | 8 | |
9 | 9 | diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf |
10 | index f218454..bb3efd1 100644 | |
10 | index 3eab2be..eb183f0 100644 | |
11 | 11 | --- a/daemon/libvirtd.conf |
12 | 12 | +++ b/daemon/libvirtd.conf |
13 | 13 | @@ -78,7 +78,7 @@ |
2 | 2 | Subject: Debianize libvirt-guests |
3 | 3 | |
4 | 4 | Origin: vendor |
5 | ||
6 | ||
7 | 5 | |
8 | 6 | --- |
9 | 7 | tools/libvirt-guests.init.sh | 43 +++++++++++++---------------------------- |
2 | 2 | Subject: Don't enable default network on boot |
3 | 3 | |
4 | 4 | to not interfere with existing network configurations |
5 | ||
6 | ||
7 | 5 | |
8 | 6 | --- |
9 | 7 | src/Makefile.am | 3 --- |
11 | 9 | 2 files changed, 0 insertions(+), 6 deletions(-) |
12 | 10 | |
13 | 11 | diff --git a/src/Makefile.am b/src/Makefile.am |
14 | index 4c98397..f79b739 100644 | |
12 | index 0a1221a..6b752f1 100644 | |
15 | 13 | --- a/src/Makefile.am |
16 | 14 | +++ b/src/Makefile.am |
17 | @@ -1586,9 +1586,6 @@ if WITH_NETWORK | |
15 | @@ -1588,9 +1588,6 @@ if WITH_NETWORK | |
18 | 16 | cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \ |
19 | 17 | $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \ |
20 | 18 | rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; } |
25 | 23 | |
26 | 24 | uninstall-local:: |
27 | 25 | diff --git a/src/Makefile.in b/src/Makefile.in |
28 | index e74ebec..4cee374 100644 | |
26 | index e52b356..171f557 100644 | |
29 | 27 | --- a/src/Makefile.in |
30 | 28 | +++ b/src/Makefile.in |
31 | @@ -7013,9 +7013,6 @@ install-data-local: | |
29 | @@ -7022,9 +7022,6 @@ install-data-local: | |
32 | 30 | @WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \ |
33 | 31 | @WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \ |
34 | 32 | @WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; } |
4 | 4 | Closes: #636712 |
5 | 5 | Thanks: Luca Capello |
6 | 6 | |
7 | ||
8 | ||
9 | 7 | --- |
10 | 8 | src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- |
11 | 9 | 1 files changed, 1 insertions(+), 1 deletions(-) |
12 | 10 | |
13 | 11 | diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c |
14 | index a62833e..3ec4f6c 100644 | |
12 | index 9c244be..25b519e 100644 | |
15 | 13 | --- a/src/nwfilter/nwfilter_ebiptables_driver.c |
16 | 14 | +++ b/src/nwfilter/nwfilter_ebiptables_driver.c |
17 | @@ -4025,7 +4025,7 @@ ebiptablesDriverInit(bool privileged) | |
18 | if (virMutexInit(&execCLIMutex)) | |
19 | return EINVAL; | |
15 | @@ -4040,7 +4040,7 @@ ebiptablesDriverInit(bool privileged) | |
16 | if (virMutexInit(&execCLIMutex) < 0) | |
17 | return -EINVAL; | |
20 | 18 | |
21 | 19 | - gawk_cmd_path = virFindFileInPath("gawk"); |
22 | 20 | + gawk_cmd_path = virFindFileInPath("awk"); |
2 | 2 | Subject: fix Debian specific path to hvm loader |
3 | 3 | |
4 | 4 | Closes: #517059 |
5 | ||
6 | ||
7 | 5 | |
8 | 6 | --- |
9 | 7 | src/xen/xen_hypervisor.c | 2 +- |
14 | 12 | 5 files changed, 6 insertions(+), 6 deletions(-) |
15 | 13 | |
16 | 14 | diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c |
17 | index 6c71b65..9c924c2 100644 | |
15 | index ee3a59c..5357ac1 100644 | |
18 | 16 | --- a/src/xen/xen_hypervisor.c |
19 | 17 | +++ b/src/xen/xen_hypervisor.c |
20 | @@ -2338,7 +2338,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, | |
18 | @@ -2397,7 +2397,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, | |
21 | 19 | "/usr/lib64/xen/bin/qemu-dm" : |
22 | 20 | "/usr/lib/xen/bin/qemu-dm"), |
23 | 21 | (guest_archs[i].hvm ? |
6 | 6 | 1 files changed, 1 insertions(+), 1 deletions(-) |
7 | 7 | |
8 | 8 | diff --git a/tools/virsh.pod b/tools/virsh.pod |
9 | index 5131ade..35f6a82 100644 | |
9 | index 138f886..5623dd2 100644 | |
10 | 10 | --- a/tools/virsh.pod |
11 | 11 | +++ b/tools/virsh.pod |
12 | @@ -98,7 +98,7 @@ Output elapsed time information for each command. | |
12 | @@ -103,7 +103,7 @@ telnet's B<^]> is used. | |
13 | 13 | |
14 | 14 | Most B<virsh> operations rely upon the libvirt library being able to |
15 | 15 | connect to an already running libvirtd service. This can usually be |
25 | 25 | 1 files changed, 3 insertions(+), 0 deletions(-) |
26 | 26 | |
27 | 27 | diff --git a/tools/virsh.c b/tools/virsh.c |
28 | index 76deaa9..a8263d6 100644 | |
28 | index e4b812e..30800d8 100644 | |
29 | 29 | --- a/tools/virsh.c |
30 | 30 | +++ b/tools/virsh.c |
31 | @@ -17098,6 +17098,9 @@ vshInit(vshControl *ctl) | |
31 | @@ -17787,6 +17787,9 @@ vshInit(vshControl *ctl) | |
32 | 32 | /* set up the signals handlers to catch disconnections */ |
33 | 33 | vshSetupSignals(); |
34 | 34 |