Codebase list libvirt / 623022f
Rebase patches Guido Günther 12 years ago
7 changed file(s) with 15 addition(s) and 23 deletion(s). Raw diff Collapse all Expand all
77 2 files changed, 10 insertions(+), 5 deletions(-)
88
99 diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
10 index f218454..bb3efd1 100644
10 index 3eab2be..eb183f0 100644
1111 --- a/daemon/libvirtd.conf
1212 +++ b/daemon/libvirtd.conf
1313 @@ -78,7 +78,7 @@
22 Subject: Debianize libvirt-guests
33
44 Origin: vendor
5
6
75
86 ---
97 tools/libvirt-guests.init.sh | 43 +++++++++++++----------------------------
22 Subject: Don't enable default network on boot
33
44 to not interfere with existing network configurations
5
6
75
86 ---
97 src/Makefile.am | 3 ---
119 2 files changed, 0 insertions(+), 6 deletions(-)
1210
1311 diff --git a/src/Makefile.am b/src/Makefile.am
14 index 4c98397..f79b739 100644
12 index 0a1221a..6b752f1 100644
1513 --- a/src/Makefile.am
1614 +++ b/src/Makefile.am
17 @@ -1586,9 +1586,6 @@ if WITH_NETWORK
15 @@ -1588,9 +1588,6 @@ if WITH_NETWORK
1816 cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
1917 $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
2018 rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
2523
2624 uninstall-local::
2725 diff --git a/src/Makefile.in b/src/Makefile.in
28 index e74ebec..4cee374 100644
26 index e52b356..171f557 100644
2927 --- a/src/Makefile.in
3028 +++ b/src/Makefile.in
31 @@ -7013,9 +7013,6 @@ install-data-local:
29 @@ -7022,9 +7022,6 @@ install-data-local:
3230 @WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
3331 @WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
3432 @WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
44 Closes: #636712
55 Thanks: Luca Capello
66
7
8
97 ---
108 src/nwfilter/nwfilter_ebiptables_driver.c | 2 +-
119 1 files changed, 1 insertions(+), 1 deletions(-)
1210
1311 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
1513 --- a/src/nwfilter/nwfilter_ebiptables_driver.c
1614 +++ 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;
2018
2119 - gawk_cmd_path = virFindFileInPath("gawk");
2220 + gawk_cmd_path = virFindFileInPath("awk");
22 Subject: fix Debian specific path to hvm loader
33
44 Closes: #517059
5
6
75
86 ---
97 src/xen/xen_hypervisor.c | 2 +-
1412 5 files changed, 6 insertions(+), 6 deletions(-)
1513
1614 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
17 index 6c71b65..9c924c2 100644
15 index ee3a59c..5357ac1 100644
1816 --- a/src/xen/xen_hypervisor.c
1917 +++ b/src/xen/xen_hypervisor.c
20 @@ -2338,7 +2338,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
18 @@ -2397,7 +2397,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
2119 "/usr/lib64/xen/bin/qemu-dm" :
2220 "/usr/lib/xen/bin/qemu-dm"),
2321 (guest_archs[i].hvm ?
66 1 files changed, 1 insertions(+), 1 deletions(-)
77
88 diff --git a/tools/virsh.pod b/tools/virsh.pod
9 index 5131ade..35f6a82 100644
9 index 138f886..5623dd2 100644
1010 --- a/tools/virsh.pod
1111 +++ 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.
1313
1414 Most B<virsh> operations rely upon the libvirt library being able to
1515 connect to an already running libvirtd service. This can usually be
2525 1 files changed, 3 insertions(+), 0 deletions(-)
2626
2727 diff --git a/tools/virsh.c b/tools/virsh.c
28 index 76deaa9..a8263d6 100644
28 index e4b812e..30800d8 100644
2929 --- a/tools/virsh.c
3030 +++ b/tools/virsh.c
31 @@ -17098,6 +17098,9 @@ vshInit(vshControl *ctl)
31 @@ -17787,6 +17787,9 @@ vshInit(vshControl *ctl)
3232 /* set up the signals handlers to catch disconnections */
3333 vshSetupSignals();
3434