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