summaryrefslogtreecommitdiff
path: root/community/libvirt/openbsd-netcat-default.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/libvirt/openbsd-netcat-default.patch')
-rw-r--r--community/libvirt/openbsd-netcat-default.patch38
1 files changed, 19 insertions, 19 deletions
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index 382611c74..8a0d9aec8 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,24 +1,24 @@
-diff -wbBur libvirt-0.9.0/src/qemu/qemu_migration.c libvirt-0.9.0.my/src/qemu/qemu_migration.c
---- libvirt-0.9.0/src/qemu/qemu_migration.c 2011-03-29 14:18:53.000000000 +0000
-+++ libvirt-0.9.0.my/src/qemu/qemu_migration.c 2011-04-04 14:34:43.000000000 +0000
-@@ -819,7 +819,7 @@
+diff -wbBur libvirt-0.9.2/src/qemu/qemu_migration.c libvirt-0.9.2.my/src/qemu/qemu_migration.c
+--- libvirt-0.9.2/src/qemu/qemu_migration.c 2011-06-06 06:47:32.000000000 +0400
++++ libvirt-0.9.2.my/src/qemu/qemu_migration.c 2011-06-06 18:27:38.000000000 +0400
+@@ -1770,7 +1770,7 @@
+ ret = qemuMonitorMigrateToUnix(priv->mon, background_flags,
unixfile);
- }
- else if (qemuCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) {
+ } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) {
- const char *args[] = { "nc", "-U", unixfile, NULL };
+ const char *args[] = { "nc.openbsd", "-U", unixfile, NULL };
- internalret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args);
+ ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args);
} else {
- internalret = -1;
-diff -wbBur libvirt-0.9.0/src/remote/remote_driver.c libvirt-0.9.0.my/src/remote/remote_driver.c
---- libvirt-0.9.0/src/remote/remote_driver.c 2011-03-29 12:57:01.000000000 +0000
-+++ libvirt-0.9.0.my/src/remote/remote_driver.c 2011-04-04 14:34:23.000000000 +0000
-@@ -777,7 +777,7 @@
- cmd_argv[j++] = strdup ("none");
+ ret = -1;
+diff -wbBur libvirt-0.9.2/src/remote/remote_driver.c libvirt-0.9.2.my/src/remote/remote_driver.c
+--- libvirt-0.9.2/src/remote/remote_driver.c 2011-06-06 04:15:12.000000000 +0400
++++ libvirt-0.9.2.my/src/remote/remote_driver.c 2011-06-06 18:27:52.000000000 +0400
+@@ -774,7 +774,7 @@
+ virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes", "-e",
+ "none", NULL);
}
- cmd_argv[j++] = strdup (priv->hostname);
-- cmd_argv[j++] = strdup (netcat ? netcat : "nc");
-+ cmd_argv[j++] = strdup (netcat ? netcat : "nc.openbsd");
- cmd_argv[j++] = strdup ("-U");
- cmd_argv[j++] = strdup (sockname ? sockname :
- (flags & VIR_CONNECT_RO
+- virCommandAddArgList(cmd, priv->hostname, netcat ? netcat : "nc",
++ virCommandAddArgList(cmd, priv->hostname, netcat ? netcat : "nc.openbsd",
+ "-U", (sockname ? sockname :
+ (flags & VIR_CONNECT_RO
+ ? LIBVIRTD_PRIV_UNIX_SOCKET_RO