117cba40b0
resolves: rhbz#1990720, rhbz#1950627 Fix license files. (cherry picked from commit4c961db464) Move appliance to separate subpackage resolves: rhbz#1989514 https://bugzilla.redhat.com/show_bug.cgi?id=1989514 Move the appliance to a subpackage (libguestfs-appliance). The main package depends on this new subpackage so in effect nothing changes for most users. However this allows the appliance to be replaced if there exists a package called "libguestfs-noappliance". This package is not provided anywhere, you have to provide the dependency or make the package yourself. But if you do this then libguestfs won't install the appliance and you are free to replace it with (eg) a fixed appliance. (cherry picked from commit941da64078)
73 lines
2.0 KiB
Diff
73 lines
2.0 KiB
Diff
From a651907e06fb488ef91fdf8b624cf1d527cfb057 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Fri, 19 Sep 2014 13:38:20 +0100
|
|
Subject: [PATCH] RHEL: Remove User-Mode Linux (RHBZ#1144197).
|
|
|
|
This isn't supported in RHEL.
|
|
---
|
|
lib/launch-uml.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/lib/launch-uml.c b/lib/launch-uml.c
|
|
index 5aec50a57..8b9fcd770 100644
|
|
--- a/lib/launch-uml.c
|
|
+++ b/lib/launch-uml.c
|
|
@@ -44,7 +44,9 @@ struct backend_uml_data {
|
|
char umid[UML_UMID_LEN+1]; /* umid=<...> unique ID. */
|
|
};
|
|
|
|
+#if 0
|
|
static void print_vmlinux_command_line (guestfs_h *g, char **argv);
|
|
+#endif
|
|
|
|
/* Run uml_mkcow to create a COW overlay. */
|
|
static char *
|
|
@@ -81,6 +83,7 @@ create_cow_overlay_uml (guestfs_h *g, void *datav, struct drive *drv)
|
|
return make_cow_overlay (g, drv->src.u.path);
|
|
}
|
|
|
|
+#if 0
|
|
/* Test for features which are not supported by the UML backend.
|
|
* Possibly some of these should just be warnings, not errors.
|
|
*/
|
|
@@ -133,10 +136,17 @@ uml_supported (guestfs_h *g)
|
|
|
|
return true;
|
|
}
|
|
+#endif
|
|
|
|
static int
|
|
launch_uml (guestfs_h *g, void *datav, const char *arg)
|
|
{
|
|
+ error (g,
|
|
+ "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n"
|
|
+ "In particular, User-Mode Linux (UML) is not supported.");
|
|
+ return -1;
|
|
+
|
|
+#if 0
|
|
struct backend_uml_data *data = datav;
|
|
CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (cmdline);
|
|
int console_sock = -1, daemon_sock = -1;
|
|
@@ -496,8 +506,10 @@ launch_uml (guestfs_h *g, void *datav, const char *arg)
|
|
}
|
|
g->state = CONFIG;
|
|
return -1;
|
|
+#endif
|
|
}
|
|
|
|
+#if 0
|
|
/* This is called from the forked subprocess just before vmlinux runs,
|
|
* so it can just print the message straight to stderr, where it will
|
|
* be picked up and funnelled through the usual appliance event API.
|
|
@@ -527,6 +539,7 @@ print_vmlinux_command_line (guestfs_h *g, char **argv)
|
|
|
|
fputc ('\n', stderr);
|
|
}
|
|
+#endif
|
|
|
|
static int
|
|
shutdown_uml (guestfs_h *g, void *datav, int check_for_errors)
|
|
--
|
|
2.31.1
|
|
|