|
 |
a7e38b |
From dabee87775ee919a8ae930ca5f03c7bb4b7616e6 Mon Sep 17 00:00:00 2001
|
|
|
a7e38b |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
a7e38b |
Date: Fri, 21 Dec 2012 15:50:11 +0000
|
|
|
a7e38b |
Subject: [PATCH] RHEL: Remove libguestfs live (RHBZ#798980).
|
|
|
a7e38b |
|
|
|
a7e38b |
This isn't supported in RHEL.
|
|
|
a7e38b |
|
|
|
a7e38b |
Disable daemon tests that require the 'unix' backend.
|
|
|
a7e38b |
---
|
|
|
a7e38b |
lib/launch-unix.c | 7 +++++++
|
|
|
a7e38b |
tests/Makefile.am | 3 ---
|
|
|
a7e38b |
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
a7e38b |
|
|
|
a7e38b |
diff --git a/lib/launch-unix.c b/lib/launch-unix.c
|
|
|
a7e38b |
index 0d344f9df..74dd1bb4a 100644
|
|
|
a7e38b |
--- a/lib/launch-unix.c
|
|
|
a7e38b |
+++ b/lib/launch-unix.c
|
|
|
a7e38b |
@@ -37,6 +37,12 @@
|
|
|
a7e38b |
static int
|
|
|
a7e38b |
launch_unix (guestfs_h *g, void *datav, const char *sockpath)
|
|
|
a7e38b |
{
|
|
|
a7e38b |
+ error (g,
|
|
|
a7e38b |
+ "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n"
|
|
|
a7e38b |
+ "In particular, \"libguestfs live\" is not supported.");
|
|
|
a7e38b |
+ return -1;
|
|
|
a7e38b |
+
|
|
|
a7e38b |
+#if 0
|
|
|
a7e38b |
int r, daemon_sock = -1;
|
|
|
a7e38b |
struct sockaddr_un addr;
|
|
|
a7e38b |
uint32_t size;
|
|
|
a7e38b |
@@ -106,6 +112,7 @@ launch_unix (guestfs_h *g, void *datav, const char *sockpath)
|
|
|
a7e38b |
g->conn = NULL;
|
|
|
a7e38b |
}
|
|
|
a7e38b |
return -1;
|
|
|
a7e38b |
+#endif
|
|
|
a7e38b |
}
|
|
|
a7e38b |
|
|
|
a7e38b |
static int
|
|
|
a7e38b |
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
|
a7e38b |
index 690e09b5e..919e2f248 100644
|
|
|
a7e38b |
--- a/tests/Makefile.am
|
|
|
a7e38b |
+++ b/tests/Makefile.am
|
|
|
a7e38b |
@@ -328,9 +328,6 @@ EXTRA_DIST += create/test-disk-create.sh
|
|
|
a7e38b |
|
|
|
a7e38b |
check_DATA = daemon/captive-daemon.pm
|
|
|
a7e38b |
|
|
|
a7e38b |
-TESTS += \
|
|
|
a7e38b |
- daemon/test-daemon-start.pl \
|
|
|
a7e38b |
- daemon/test-btrfs.pl
|
|
|
a7e38b |
EXTRA_DIST += \
|
|
|
a7e38b |
daemon/test-daemon-start.pl \
|
|
|
a7e38b |
daemon/test-btrfs.pl
|
|
|
a7e38b |
--
|
|
|
a7e38b |
2.31.1
|
|
|
a7e38b |
|