Compare commits
35 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
faeb7c9b1e | ||
|
|
488317994d | ||
|
|
0c63156ee4 | ||
|
|
f719d4f5ea | ||
|
|
e67626d9c3 | ||
|
|
027e4dc34d | ||
|
|
dff2d2ff2f | ||
|
|
34aa2141a0 | ||
|
|
e597c5b31b | ||
|
|
f45117738d | ||
|
|
80cccb97e6 | ||
|
|
dfed7d7522 | ||
|
|
ed326bbeff | ||
|
|
46e1226c7f | ||
|
|
cc5d0a7465 | ||
|
|
9b405c9739 | ||
|
|
abd4d4b3d6 | ||
|
|
c7d6ee374d | ||
|
|
6bcf52b151 | ||
|
|
4b154c96dc | ||
|
|
224ba1b52f | ||
|
|
04639d5808 | ||
|
|
7773064795 | ||
|
|
7496f55fd4 | ||
|
|
ff3a3410b7 | ||
|
|
78729c6c7e | ||
|
|
db1fafdee4 | ||
|
|
109d13a094 | ||
|
|
3ad6d7c006 | ||
|
|
2d90b95845 | ||
|
|
c4ee04f298 | ||
|
|
759e2fd7dd | ||
|
|
f2e540811a | ||
|
|
cc1d44fab4 | ||
|
|
4e13436381 |
12 changed files with 1382 additions and 649 deletions
55
0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch
Normal file
55
0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
From 802b515677d77936a2ae0d6e945a0364e4246002 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Fri, 21 Dec 2012 15:50:11 +0000
|
||||
Subject: [PATCH 1/5] RHEL: Remove libguestfs live (RHBZ#798980).
|
||||
|
||||
This isn't supported in RHEL.
|
||||
|
||||
Disable daemon tests that require the 'unix' backend.
|
||||
---
|
||||
lib/launch-unix.c | 7 +++++++
|
||||
tests/Makefile.am | 3 ---
|
||||
2 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/launch-unix.c b/lib/launch-unix.c
|
||||
index 0d344f9df..74dd1bb4a 100644
|
||||
--- a/lib/launch-unix.c
|
||||
+++ b/lib/launch-unix.c
|
||||
@@ -37,6 +37,12 @@
|
||||
static int
|
||||
launch_unix (guestfs_h *g, void *datav, const char *sockpath)
|
||||
{
|
||||
+ error (g,
|
||||
+ "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n"
|
||||
+ "In particular, \"libguestfs live\" is not supported.");
|
||||
+ return -1;
|
||||
+
|
||||
+#if 0
|
||||
int r, daemon_sock = -1;
|
||||
struct sockaddr_un addr;
|
||||
uint32_t size;
|
||||
@@ -106,6 +112,7 @@ launch_unix (guestfs_h *g, void *datav, const char *sockpath)
|
||||
g->conn = NULL;
|
||||
}
|
||||
return -1;
|
||||
+#endif
|
||||
}
|
||||
|
||||
static int
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 690e09b5e..919e2f248 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -328,9 +328,6 @@ EXTRA_DIST += create/test-disk-create.sh
|
||||
|
||||
check_DATA = daemon/captive-daemon.pm
|
||||
|
||||
-TESTS += \
|
||||
- daemon/test-daemon-start.pl \
|
||||
- daemon/test-btrfs.pl
|
||||
EXTRA_DIST += \
|
||||
daemon/test-daemon-start.pl \
|
||||
daemon/test-btrfs.pl
|
||||
--
|
||||
2.30.1
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
From 7af98c099c181f0b378a8390fb72f424d4bc7a4a Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Thu, 25 Mar 2021 19:44:34 +0000
|
||||
Subject: [PATCH] Revert "appliance: Use <cpu mode="maximum"/> for -cpu max on
|
||||
libvirt."
|
||||
|
||||
This reverts commit 13ceb6a87b2869909a6a0e3c8caa962b72e4cb0e.
|
||||
---
|
||||
lib/launch-libvirt.c | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
|
||||
index 194530c49..2d995bee0 100644
|
||||
--- a/lib/launch-libvirt.c
|
||||
+++ b/lib/launch-libvirt.c
|
||||
@@ -1183,8 +1183,13 @@ construct_libvirt_xml_cpu (guestfs_h *g,
|
||||
} end_element ();
|
||||
}
|
||||
else if (STREQ (cpu_model, "max")) {
|
||||
- /* https://bugzilla.redhat.com/show_bug.cgi?id=1935572#c11 */
|
||||
- attribute ("mode", "maximum");
|
||||
+ if (params->data->is_kvm)
|
||||
+ attribute ("mode", "host-passthrough");
|
||||
+ else
|
||||
+ attribute ("mode", "host-model");
|
||||
+ start_element ("model") {
|
||||
+ attribute ("fallback", "allow");
|
||||
+ } end_element ();
|
||||
}
|
||||
else
|
||||
single_element ("model", cpu_model);
|
||||
--
|
||||
2.29.0.rc2
|
||||
|
||||
329
0002-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
Normal file
329
0002-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
Normal file
|
|
@ -0,0 +1,329 @@
|
|||
From c8770be96ddbebd7f1f726d97aa566fb1558ce2d Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Thu, 18 Jul 2013 18:31:53 +0100
|
||||
Subject: [PATCH 2/5] RHEL: Remove 9p APIs from RHEL (RHBZ#921710).
|
||||
|
||||
---
|
||||
daemon/9p.c | 182 --------------------------------------
|
||||
daemon/Makefile.am | 1 -
|
||||
docs/C_SOURCE_FILES | 1 -
|
||||
generator/actions_core.ml | 21 -----
|
||||
generator/proc_nr.ml | 2 -
|
||||
gobject/Makefile.inc | 2 -
|
||||
po/POTFILES | 2 -
|
||||
tests/Makefile.am | 1 -
|
||||
8 files changed, 212 deletions(-)
|
||||
delete mode 100644 daemon/9p.c
|
||||
|
||||
diff --git a/daemon/9p.c b/daemon/9p.c
|
||||
deleted file mode 100644
|
||||
index 743a96abd..000000000
|
||||
--- a/daemon/9p.c
|
||||
+++ /dev/null
|
||||
@@ -1,182 +0,0 @@
|
||||
-/* libguestfs - the guestfsd daemon
|
||||
- * Copyright (C) 2011 Red Hat Inc.
|
||||
- *
|
||||
- * This program is free software; you can redistribute it and/or modify
|
||||
- * it under the terms of the GNU General Public License as published by
|
||||
- * the Free Software Foundation; either version 2 of the License, or
|
||||
- * (at your option) any later version.
|
||||
- *
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
- * GNU General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
- */
|
||||
-
|
||||
-#include <config.h>
|
||||
-
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
-#include <unistd.h>
|
||||
-#include <limits.h>
|
||||
-#include <errno.h>
|
||||
-#include <sys/types.h>
|
||||
-#include <sys/stat.h>
|
||||
-#include <dirent.h>
|
||||
-#include <fcntl.h>
|
||||
-
|
||||
-#include "ignore-value.h"
|
||||
-
|
||||
-#include "daemon.h"
|
||||
-#include "actions.h"
|
||||
-
|
||||
-#define BUS_PATH "/sys/bus/virtio/drivers/9pnet_virtio"
|
||||
-
|
||||
-static void
|
||||
-modprobe_9pnet_virtio (void)
|
||||
-{
|
||||
- /* Required with Linux 5.6 and maybe earlier kernels. For unclear
|
||||
- * reasons the module is not an automatic dependency of the 9p
|
||||
- * module so doesn't get loaded automatically.
|
||||
- */
|
||||
- ignore_value (command (NULL, NULL, "modprobe", "9pnet_virtio", NULL));
|
||||
-}
|
||||
-
|
||||
-/* https://bugzilla.redhat.com/show_bug.cgi?id=714981#c1 */
|
||||
-char **
|
||||
-do_list_9p (void)
|
||||
-{
|
||||
- CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (r);
|
||||
- DIR *dir;
|
||||
-
|
||||
- modprobe_9pnet_virtio ();
|
||||
-
|
||||
- dir = opendir (BUS_PATH);
|
||||
- if (!dir) {
|
||||
- perror ("opendir: " BUS_PATH);
|
||||
- if (errno != ENOENT) {
|
||||
- reply_with_perror ("opendir: " BUS_PATH);
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- /* If this directory doesn't exist, it probably means that
|
||||
- * the virtio driver isn't loaded. Don't return an error
|
||||
- * in this case, but return an empty list.
|
||||
- */
|
||||
- if (end_stringsbuf (&r) == -1)
|
||||
- return NULL;
|
||||
-
|
||||
- return take_stringsbuf (&r);
|
||||
- }
|
||||
-
|
||||
- while (1) {
|
||||
- struct dirent *d;
|
||||
-
|
||||
- errno = 0;
|
||||
- d = readdir (dir);
|
||||
- if (d == NULL) break;
|
||||
-
|
||||
- if (STRPREFIX (d->d_name, "virtio")) {
|
||||
- CLEANUP_FREE char *mount_tag_path = NULL;
|
||||
- if (asprintf (&mount_tag_path, BUS_PATH "/%s/mount_tag",
|
||||
- d->d_name) == -1) {
|
||||
- reply_with_perror ("asprintf");
|
||||
- closedir (dir);
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- /* A bit unclear, but it looks like the virtio transport allows
|
||||
- * the mount tag length to be unlimited (or up to 65536 bytes).
|
||||
- * See: linux/include/linux/virtio_9p.h
|
||||
- */
|
||||
- CLEANUP_FREE char *mount_tag = read_whole_file (mount_tag_path, NULL);
|
||||
- if (mount_tag == 0)
|
||||
- continue;
|
||||
-
|
||||
- if (add_string (&r, mount_tag) == -1) {
|
||||
- closedir (dir);
|
||||
- return NULL;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* Check readdir didn't fail */
|
||||
- if (errno != 0) {
|
||||
- reply_with_perror ("readdir: /sys/block");
|
||||
- closedir (dir);
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- /* Close the directory handle */
|
||||
- if (closedir (dir) == -1) {
|
||||
- reply_with_perror ("closedir: /sys/block");
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- /* Sort the tags. */
|
||||
- if (r.size > 0)
|
||||
- sort_strings (r.argv, r.size);
|
||||
-
|
||||
- /* NULL terminate the list */
|
||||
- if (end_stringsbuf (&r) == -1)
|
||||
- return NULL;
|
||||
-
|
||||
- return take_stringsbuf (&r);
|
||||
-}
|
||||
-
|
||||
-/* Takes optional arguments, consult optargs_bitmask. */
|
||||
-int
|
||||
-do_mount_9p (const char *mount_tag, const char *mountpoint, const char *options)
|
||||
-{
|
||||
- CLEANUP_FREE char *mp = NULL, *opts = NULL, *err = NULL;
|
||||
- struct stat statbuf;
|
||||
- int r;
|
||||
-
|
||||
- ABS_PATH (mountpoint, 0, return -1);
|
||||
-
|
||||
- mp = sysroot_path (mountpoint);
|
||||
- if (!mp) {
|
||||
- reply_with_perror ("malloc");
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- /* Check the mountpoint exists and is a directory. */
|
||||
- if (stat (mp, &statbuf) == -1) {
|
||||
- reply_with_perror ("%s", mountpoint);
|
||||
- return -1;
|
||||
- }
|
||||
- if (!S_ISDIR (statbuf.st_mode)) {
|
||||
- reply_with_perror ("%s: mount point is not a directory", mountpoint);
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- /* Add trans=virtio to the options. */
|
||||
- if ((optargs_bitmask & GUESTFS_MOUNT_9P_OPTIONS_BITMASK) &&
|
||||
- STRNEQ (options, "")) {
|
||||
- if (asprintf (&opts, "trans=virtio,%s", options) == -1) {
|
||||
- reply_with_perror ("asprintf");
|
||||
- return -1;
|
||||
- }
|
||||
- }
|
||||
- else {
|
||||
- opts = strdup ("trans=virtio");
|
||||
- if (opts == NULL) {
|
||||
- reply_with_perror ("strdup");
|
||||
- return -1;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- modprobe_9pnet_virtio ();
|
||||
- r = command (NULL, &err,
|
||||
- "mount", "-o", opts, "-t", "9p", mount_tag, mp, NULL);
|
||||
- if (r == -1) {
|
||||
- reply_with_error ("%s on %s: %s", mount_tag, mountpoint, err);
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
|
||||
index 216029b7c..8bf601367 100644
|
||||
--- a/daemon/Makefile.am
|
||||
+++ b/daemon/Makefile.am
|
||||
@@ -83,7 +83,6 @@ guestfsd_SOURCES = \
|
||||
../common/protocol/guestfs_protocol.h \
|
||||
../common/utils/cleanups.h \
|
||||
../common/utils/guestfs-utils.h \
|
||||
- 9p.c \
|
||||
acl.c \
|
||||
actions.h \
|
||||
available.c \
|
||||
diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
|
||||
index 060be051b..7a05f3b24 100644
|
||||
--- a/docs/C_SOURCE_FILES
|
||||
+++ b/docs/C_SOURCE_FILES
|
||||
@@ -43,7 +43,6 @@ common/visit/visit.c
|
||||
common/visit/visit.h
|
||||
common/windows/windows.c
|
||||
common/windows/windows.h
|
||||
-daemon/9p.c
|
||||
daemon/acl.c
|
||||
daemon/actions.h
|
||||
daemon/augeas.c
|
||||
diff --git a/generator/actions_core.ml b/generator/actions_core.ml
|
||||
index bb92ef2ca..5f849bad1 100644
|
||||
--- a/generator/actions_core.ml
|
||||
+++ b/generator/actions_core.ml
|
||||
@@ -6157,27 +6157,6 @@ This returns true iff the device exists and contains all zero bytes.
|
||||
|
||||
Note that for large devices this can take a long time to run." };
|
||||
|
||||
- { defaults with
|
||||
- name = "list_9p"; added = (1, 11, 12);
|
||||
- style = RStringList (RPlainString, "mounttags"), [], [];
|
||||
- shortdesc = "list 9p filesystems";
|
||||
- longdesc = "\
|
||||
-List all 9p filesystems attached to the guest. A list of
|
||||
-mount tags is returned." };
|
||||
-
|
||||
- { defaults with
|
||||
- name = "mount_9p"; added = (1, 11, 12);
|
||||
- style = RErr, [String (PlainString, "mounttag"); String (PlainString, "mountpoint")], [OString "options"];
|
||||
- camel_name = "Mount9P";
|
||||
- shortdesc = "mount 9p filesystem";
|
||||
- longdesc = "\
|
||||
-Mount the virtio-9p filesystem with the tag C<mounttag> on the
|
||||
-directory C<mountpoint>.
|
||||
-
|
||||
-If required, C<trans=virtio> will be automatically added to the options.
|
||||
-Any other options required can be passed in the optional C<options>
|
||||
-parameter." };
|
||||
-
|
||||
{ defaults with
|
||||
name = "list_dm_devices"; added = (1, 11, 15);
|
||||
style = RStringList (RDevice, "devices"), [], [];
|
||||
diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml
|
||||
index 74b95baf7..6b6cb7353 100644
|
||||
--- a/generator/proc_nr.ml
|
||||
+++ b/generator/proc_nr.ml
|
||||
@@ -295,8 +295,6 @@ let proc_nr = [
|
||||
282, "internal_autosync";
|
||||
283, "is_zero";
|
||||
284, "is_zero_device";
|
||||
-285, "list_9p";
|
||||
-286, "mount_9p";
|
||||
287, "list_dm_devices";
|
||||
288, "ntfsresize";
|
||||
289, "btrfs_filesystem_resize";
|
||||
diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc
|
||||
index 650f8ddac..c4e735967 100644
|
||||
--- a/gobject/Makefile.inc
|
||||
+++ b/gobject/Makefile.inc
|
||||
@@ -94,7 +94,6 @@ guestfs_gobject_headers= \
|
||||
include/guestfs-gobject/optargs-mksquashfs.h \
|
||||
include/guestfs-gobject/optargs-mkswap.h \
|
||||
include/guestfs-gobject/optargs-mktemp.h \
|
||||
- include/guestfs-gobject/optargs-mount_9p.h \
|
||||
include/guestfs-gobject/optargs-mount_local.h \
|
||||
include/guestfs-gobject/optargs-ntfsclone_out.h \
|
||||
include/guestfs-gobject/optargs-ntfsfix.h \
|
||||
@@ -188,7 +187,6 @@ guestfs_gobject_sources= \
|
||||
src/optargs-mksquashfs.c \
|
||||
src/optargs-mkswap.c \
|
||||
src/optargs-mktemp.c \
|
||||
- src/optargs-mount_9p.c \
|
||||
src/optargs-mount_local.c \
|
||||
src/optargs-ntfsclone_out.c \
|
||||
src/optargs-ntfsfix.c \
|
||||
diff --git a/po/POTFILES b/po/POTFILES
|
||||
index c5f4e6aa7..aeb701e32 100644
|
||||
--- a/po/POTFILES
|
||||
+++ b/po/POTFILES
|
||||
@@ -26,7 +26,6 @@ common/utils/stringlists-utils.c
|
||||
common/utils/utils.c
|
||||
common/visit/visit.c
|
||||
common/windows/windows.c
|
||||
-daemon/9p.c
|
||||
daemon/acl.c
|
||||
daemon/augeas.c
|
||||
daemon/available.c
|
||||
@@ -251,7 +250,6 @@ gobject/src/optargs-mkfs_btrfs.c
|
||||
gobject/src/optargs-mksquashfs.c
|
||||
gobject/src/optargs-mkswap.c
|
||||
gobject/src/optargs-mktemp.c
|
||||
-gobject/src/optargs-mount_9p.c
|
||||
gobject/src/optargs-mount_local.c
|
||||
gobject/src/optargs-ntfsclone_out.c
|
||||
gobject/src/optargs-ntfsfix.c
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 919e2f248..e3613fec4 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -43,7 +43,6 @@ check-slow:
|
||||
check-valgrind:
|
||||
$(MAKE) VG="@VG@" check
|
||||
|
||||
-TESTS += 9p/test-9p.sh
|
||||
EXTRA_DIST += 9p/test-9p.sh
|
||||
|
||||
SLOW_TESTS += bigdirs/test-big-dirs.pl
|
||||
--
|
||||
2.30.1
|
||||
|
||||
609
0003-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
Normal file
609
0003-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
Normal file
|
|
@ -0,0 +1,609 @@
|
|||
From 41beea618d3da3b0351b3d8aa7eb7be40f369877 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 29 Jul 2013 14:47:56 +0100
|
||||
Subject: [PATCH 3/5] RHEL: Disable unsupported remote drive protocols
|
||||
(RHBZ#962113).
|
||||
|
||||
This disables support for unsupported remote drive protocols:
|
||||
|
||||
* ftp
|
||||
* ftps
|
||||
* http
|
||||
* https
|
||||
* tftp
|
||||
* gluster
|
||||
* iscsi
|
||||
* sheepdog
|
||||
* ssh
|
||||
|
||||
Note 'nbd' is not disabled, and of course 'file' works.
|
||||
|
||||
We hope to gradually add some of these back over the lifetime of RHEL.
|
||||
---
|
||||
docs/guestfs-testing.pod | 20 -----
|
||||
fish/guestfish.pod | 66 ++--------------
|
||||
fish/test-add-uri.sh | 32 --------
|
||||
generator/actions_core.ml | 50 +------------
|
||||
lib/drives.c | 8 ++
|
||||
lib/guestfs.pod | 100 -------------------------
|
||||
tests/disks/test-qemu-drive-libvirt.sh | 28 -------
|
||||
tests/disks/test-qemu-drive.sh | 60 ---------------
|
||||
8 files changed, 16 insertions(+), 348 deletions(-)
|
||||
|
||||
diff --git a/docs/guestfs-testing.pod b/docs/guestfs-testing.pod
|
||||
index f558964bf..8f264ed17 100644
|
||||
--- a/docs/guestfs-testing.pod
|
||||
+++ b/docs/guestfs-testing.pod
|
||||
@@ -109,26 +109,6 @@ image. To exit, type C<exit>.
|
||||
If you get an error, try enabling debugging (add C<-v> to the command
|
||||
line). Also make sure that L<libguestfs-test-tool(1)> succeeds.
|
||||
|
||||
-=head2 Try to open a remote guest image with guestfish.
|
||||
-
|
||||
-You may also have to disable libvirt by setting this:
|
||||
-
|
||||
- export LIBGUESTFS_BACKEND=direct
|
||||
-
|
||||
-If you have a disk image available over HTTP/FTP, try to open it.
|
||||
-
|
||||
- guestfish --ro -i --format=raw -a http://www.example.com/disk.img
|
||||
-
|
||||
-For SSH you will need to make sure that ssh-agent is set up so you
|
||||
-don't need a password to log in to the remote machine. Then a command
|
||||
-similar to this should work:
|
||||
-
|
||||
- guestfish --ro -i --format=raw \
|
||||
- -a ssh://remote.example.com/path/to/disk.img
|
||||
-
|
||||
-If you get an error, try enabling debugging (add C<-v> to the command
|
||||
-line). Also make sure that L<libguestfs-test-tool(1)> succeeds.
|
||||
-
|
||||
=head2 Run virt-alignment-scan on all your guests.
|
||||
|
||||
Run L<virt-alignment-scan(1)> on guests or disk images:
|
||||
diff --git a/fish/guestfish.pod b/fish/guestfish.pod
|
||||
index 9f086f110..bb4167b06 100644
|
||||
--- a/fish/guestfish.pod
|
||||
+++ b/fish/guestfish.pod
|
||||
@@ -131,9 +131,9 @@ To list what is available do:
|
||||
|
||||
=head2 Remote drives
|
||||
|
||||
-Access a remote disk using ssh:
|
||||
+Access a remote disk using NBD:
|
||||
|
||||
- guestfish -a ssh://example.com/path/to/disk.img
|
||||
+ guestfish -a nbd://example.com
|
||||
|
||||
=head2 Remote control
|
||||
|
||||
@@ -1134,12 +1134,12 @@ L<guestfs(3)/REMOTE STORAGE>>.
|
||||
On the command line, you can use the I<-a> option to add network
|
||||
block devices using a URI-style format, for example:
|
||||
|
||||
- guestfish -a ssh://root@example.com/disk.img
|
||||
+ guestfish -a nbd://example.com
|
||||
|
||||
URIs I<cannot> be used with the L</add> command. The equivalent
|
||||
command using the API directly is:
|
||||
|
||||
- ><fs> add /disk.img protocol:ssh server:tcp:example.com username:root
|
||||
+ ><fs> add /disk.img protocol:nbd server:tcp:example.com
|
||||
|
||||
The possible I<-a URI> formats are described below.
|
||||
|
||||
@@ -1149,40 +1149,6 @@ The possible I<-a URI> formats are described below.
|
||||
|
||||
Add the local disk image (or device) called F<disk.img>.
|
||||
|
||||
-=head2 B<-a ftp://[user@]example.com[:port]/disk.img>
|
||||
-
|
||||
-=head2 B<-a ftps://[user@]example.com[:port]/disk.img>
|
||||
-
|
||||
-=head2 B<-a http://[user@]example.com[:port]/disk.img>
|
||||
-
|
||||
-=head2 B<-a https://[user@]example.com[:port]/disk.img>
|
||||
-
|
||||
-=head2 B<-a tftp://[user@]example.com[:port]/disk.img>
|
||||
-
|
||||
-Add a disk located on a remote FTP, HTTP or TFTP server.
|
||||
-
|
||||
-The equivalent API command would be:
|
||||
-
|
||||
- ><fs> add /disk.img protocol:(ftp|...) server:tcp:example.com
|
||||
-
|
||||
-=head2 B<-a gluster://example.com[:port]/volname/image>
|
||||
-
|
||||
-Add a disk image located on GlusterFS storage.
|
||||
-
|
||||
-The server is the one running C<glusterd>, and may be C<localhost>.
|
||||
-
|
||||
-The equivalent API command would be:
|
||||
-
|
||||
- ><fs> add volname/image protocol:gluster server:tcp:example.com
|
||||
-
|
||||
-=head2 B<-a iscsi://example.com[:port]/target-iqn-name[/lun]>
|
||||
-
|
||||
-Add a disk located on an iSCSI server.
|
||||
-
|
||||
-The equivalent API command would be:
|
||||
-
|
||||
- ><fs> add target-iqn-name/lun protocol:iscsi server:tcp:example.com
|
||||
-
|
||||
=head2 B<-a nbd://example.com[:port]>
|
||||
|
||||
=head2 B<-a nbd://example.com[:port]/exportname>
|
||||
@@ -1217,35 +1183,13 @@ The equivalent API command would be:
|
||||
|
||||
><fs> add pool/disk protocol:rbd server:tcp:example.com:port
|
||||
|
||||
-=head2 B<-a sheepdog://[example.com[:port]]/volume/image>
|
||||
-
|
||||
-Add a disk image located on a Sheepdog volume.
|
||||
-
|
||||
-The server name is optional. Although libguestfs and Sheepdog
|
||||
-supports multiple servers, only at most one server can be specified
|
||||
-when using this URI syntax.
|
||||
-
|
||||
-The equivalent API command would be:
|
||||
-
|
||||
- ><fs> add volume protocol:sheepdog [server:tcp:example.com]
|
||||
-
|
||||
-=head2 B<-a ssh://[user@]example.com[:port]/disk.img>
|
||||
-
|
||||
-Add a disk image located on a remote server, accessed using the Secure
|
||||
-Shell (ssh) SFTP protocol. SFTP is supported out of the box by all
|
||||
-major SSH servers.
|
||||
-
|
||||
-The equivalent API command would be:
|
||||
-
|
||||
- ><fs> add /disk protocol:ssh server:tcp:example.com [username:user]
|
||||
-
|
||||
Note that the URIs follow the syntax of
|
||||
L<RFC 3986|https://tools.ietf.org/html/rfc3986>: in particular, there
|
||||
are restrictions on the allowed characters for the various components
|
||||
of the URI. Characters such as C<:>, C<@>, and C</> B<must> be
|
||||
percent-encoded:
|
||||
|
||||
- $ guestfish -a ssh://user:pass%40word@example.com/disk.img
|
||||
+ $ guestfish -a rbd://user:pass%40word@example.com[:port]/pool/disk
|
||||
|
||||
In this case, the password is C<pass@word>.
|
||||
|
||||
diff --git a/fish/test-add-uri.sh b/fish/test-add-uri.sh
|
||||
index 21d424984..ddabeb639 100755
|
||||
--- a/fish/test-add-uri.sh
|
||||
+++ b/fish/test-add-uri.sh
|
||||
@@ -40,14 +40,6 @@ function fail ()
|
||||
$VG guestfish -x -a file://$abs_builddir/test-add-uri.img </dev/null >test-add-uri.out 2>&1
|
||||
grep -sq 'add_drive ".*/test-add-uri.img"' test-add-uri.out || fail
|
||||
|
||||
-# curl
|
||||
-$VG guestfish -x -a ftp://user@example.com/disk.img </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "/disk.img" "protocol:ftp" "server:tcp:example.com" "username:user"' test-add-uri.out || fail
|
||||
-
|
||||
-# gluster
|
||||
-$VG guestfish -x -a gluster://example.com/disk </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "disk" "protocol:gluster" "server:tcp:example.com"' test-add-uri.out || fail
|
||||
-
|
||||
# NBD
|
||||
$VG guestfish -x -a nbd://example.com </dev/null >test-add-uri.out 2>&1
|
||||
grep -sq 'add_drive "" "protocol:nbd" "server:tcp:example.com"' test-add-uri.out || fail
|
||||
@@ -67,29 +59,5 @@ grep -sq 'add_drive "pool/disk" "protocol:rbd" "server:tcp:example.com:6789"' te
|
||||
$VG guestfish -x -a rbd:///pool/disk </dev/null >test-add-uri.out 2>&1
|
||||
grep -sq 'add_drive "pool/disk" "protocol:rbd"' test-add-uri.out || fail
|
||||
|
||||
-# sheepdog
|
||||
-$VG guestfish -x -a sheepdog:///volume/image </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "volume/image" "protocol:sheepdog"' test-add-uri.out || fail
|
||||
-
|
||||
-$VG guestfish -x -a sheepdog://example.com:3000/volume/image </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "volume/image" "protocol:sheepdog" "server:tcp:example.com:3000"' test-add-uri.out || fail
|
||||
-
|
||||
-# ssh
|
||||
-$VG guestfish -x -a ssh://example.com/disk.img </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "/disk.img" "protocol:ssh" "server:tcp:example.com"' test-add-uri.out || fail
|
||||
-
|
||||
-$VG guestfish -x -a ssh://user@example.com/disk.img </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "/disk.img" "protocol:ssh" "server:tcp:example.com" "username:user"' test-add-uri.out || fail
|
||||
-
|
||||
-$VG guestfish -x -a ssh://user@example.com:2000/disk.img </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "/disk.img" "protocol:ssh" "server:tcp:example.com:2000" "username:user"' test-add-uri.out || fail
|
||||
-
|
||||
-# iSCSI
|
||||
-$VG guestfish -x -a iscsi://example.com/iqn.2015-12.com.libguestfs:test1/0 </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "iqn.2015-12.com.libguestfs:test1/0" "protocol:iscsi" "server:tcp:example.com"' test-add-uri.out || fail
|
||||
-
|
||||
-$VG guestfish -x -a iscsi://user:password@example.com/iqn.2015-12.com.libguestfs:test2/0 </dev/null >test-add-uri.out 2>&1
|
||||
-grep -sq 'add_drive "iqn.2015-12.com.libguestfs:test2/0" "protocol:iscsi" "server:tcp:example.com" "username:user" "secret:password"' test-add-uri.out || fail
|
||||
-
|
||||
rm test-add-uri.out
|
||||
rm test-add-uri.img
|
||||
diff --git a/generator/actions_core.ml b/generator/actions_core.ml
|
||||
index 5f849bad1..f6f8844b8 100644
|
||||
--- a/generator/actions_core.ml
|
||||
+++ b/generator/actions_core.ml
|
||||
@@ -297,29 +297,6 @@ F<filename> is interpreted as a local file or device.
|
||||
This is the default if the optional protocol parameter
|
||||
is omitted.
|
||||
|
||||
-=item C<protocol = \"ftp\"|\"ftps\"|\"http\"|\"https\"|\"tftp\">
|
||||
-
|
||||
-Connect to a remote FTP, HTTP or TFTP server.
|
||||
-The C<server> parameter must also be supplied - see below.
|
||||
-
|
||||
-See also: L<guestfs(3)/FTP, HTTP AND TFTP>
|
||||
-
|
||||
-=item C<protocol = \"gluster\">
|
||||
-
|
||||
-Connect to the GlusterFS server.
|
||||
-The C<server> parameter must also be supplied - see below.
|
||||
-
|
||||
-See also: L<guestfs(3)/GLUSTER>
|
||||
-
|
||||
-=item C<protocol = \"iscsi\">
|
||||
-
|
||||
-Connect to the iSCSI server.
|
||||
-The C<server> parameter must also be supplied - see below.
|
||||
-The C<username> parameter may be supplied. See below.
|
||||
-The C<secret> parameter may be supplied. See below.
|
||||
-
|
||||
-See also: L<guestfs(3)/ISCSI>.
|
||||
-
|
||||
=item C<protocol = \"nbd\">
|
||||
|
||||
Connect to the Network Block Device server.
|
||||
@@ -336,22 +313,6 @@ The C<secret> parameter may be supplied. See below.
|
||||
|
||||
See also: L<guestfs(3)/CEPH>.
|
||||
|
||||
-=item C<protocol = \"sheepdog\">
|
||||
-
|
||||
-Connect to the Sheepdog server.
|
||||
-The C<server> parameter may also be supplied - see below.
|
||||
-
|
||||
-See also: L<guestfs(3)/SHEEPDOG>.
|
||||
-
|
||||
-=item C<protocol = \"ssh\">
|
||||
-
|
||||
-Connect to the Secure Shell (ssh) server.
|
||||
-
|
||||
-The C<server> parameter must be supplied.
|
||||
-The C<username> parameter may be supplied. See below.
|
||||
-
|
||||
-See also: L<guestfs(3)/SSH>.
|
||||
-
|
||||
=back
|
||||
|
||||
=item C<server>
|
||||
@@ -362,13 +323,8 @@ is a list of server(s).
|
||||
Protocol Number of servers required
|
||||
-------- --------------------------
|
||||
file List must be empty or param not used at all
|
||||
- ftp|ftps|http|https|tftp Exactly one
|
||||
- gluster Exactly one
|
||||
- iscsi Exactly one
|
||||
nbd Exactly one
|
||||
rbd Zero or more
|
||||
- sheepdog Zero or more
|
||||
- ssh Exactly one
|
||||
|
||||
Each list element is a string specifying a server. The string must be
|
||||
in one of the following formats:
|
||||
@@ -384,10 +340,10 @@ for the protocol is used (see F</etc/services>).
|
||||
|
||||
=item C<username>
|
||||
|
||||
-For the C<ftp>, C<ftps>, C<http>, C<https>, C<iscsi>, C<rbd>, C<ssh>
|
||||
-and C<tftp> protocols, this specifies the remote username.
|
||||
+For the C<rbd>
|
||||
+protocol, this specifies the remote username.
|
||||
|
||||
-If not given, then the local username is used for C<ssh>, and no authentication
|
||||
+If not given, then no authentication
|
||||
is attempted for ceph. But note this sometimes may give unexpected results, for
|
||||
example if using the libvirt backend and if the libvirt backend is configured to
|
||||
start the qemu appliance as a special user such as C<qemu.qemu>. If in doubt,
|
||||
diff --git a/lib/drives.c b/lib/drives.c
|
||||
index 46af66db4..c81ded5d7 100644
|
||||
--- a/lib/drives.c
|
||||
+++ b/lib/drives.c
|
||||
@@ -168,6 +168,7 @@ create_drive_non_file (guestfs_h *g,
|
||||
return drv;
|
||||
}
|
||||
|
||||
+#if 0 /* DISABLED IN RHEL 8 */
|
||||
static struct drive *
|
||||
create_drive_curl (guestfs_h *g,
|
||||
const struct drive_create_data *data)
|
||||
@@ -226,6 +227,7 @@ create_drive_gluster (guestfs_h *g,
|
||||
|
||||
return create_drive_non_file (g, data);
|
||||
}
|
||||
+#endif /* DISABLED IN RHEL 8 */
|
||||
|
||||
static int
|
||||
nbd_port (void)
|
||||
@@ -294,6 +296,7 @@ create_drive_rbd (guestfs_h *g,
|
||||
return create_drive_non_file (g, data);
|
||||
}
|
||||
|
||||
+#if 0 /* DISABLED IN RHEL 8 */
|
||||
static struct drive *
|
||||
create_drive_sheepdog (guestfs_h *g,
|
||||
const struct drive_create_data *data)
|
||||
@@ -394,6 +397,7 @@ create_drive_iscsi (guestfs_h *g,
|
||||
|
||||
return create_drive_non_file (g, data);
|
||||
}
|
||||
+#endif /* DISABLED IN RHEL 8 */
|
||||
|
||||
/**
|
||||
* Create the special F</dev/null> drive.
|
||||
@@ -856,6 +860,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
|
||||
drv = create_drive_file (g, &data);
|
||||
}
|
||||
}
|
||||
+#if 0 /* DISABLED IN RHEL 8 */
|
||||
else if (STREQ (protocol, "ftp")) {
|
||||
data.protocol = drive_protocol_ftp;
|
||||
drv = create_drive_curl (g, &data);
|
||||
@@ -880,6 +885,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
|
||||
data.protocol = drive_protocol_iscsi;
|
||||
drv = create_drive_iscsi (g, &data);
|
||||
}
|
||||
+#endif /* DISABLED IN RHEL 8 */
|
||||
else if (STREQ (protocol, "nbd")) {
|
||||
data.protocol = drive_protocol_nbd;
|
||||
drv = create_drive_nbd (g, &data);
|
||||
@@ -888,6 +894,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
|
||||
data.protocol = drive_protocol_rbd;
|
||||
drv = create_drive_rbd (g, &data);
|
||||
}
|
||||
+#if 0 /* DISABLED IN RHEL 8 */
|
||||
else if (STREQ (protocol, "sheepdog")) {
|
||||
data.protocol = drive_protocol_sheepdog;
|
||||
drv = create_drive_sheepdog (g, &data);
|
||||
@@ -900,6 +907,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
|
||||
data.protocol = drive_protocol_tftp;
|
||||
drv = create_drive_curl (g, &data);
|
||||
}
|
||||
+#endif /* DISABLED IN RHEL 8 */
|
||||
else {
|
||||
error (g, _("unknown protocol ‘%s’"), protocol);
|
||||
drv = NULL; /*FALLTHROUGH*/
|
||||
diff --git a/lib/guestfs.pod b/lib/guestfs.pod
|
||||
index ff58aa0bb..1af00f1bb 100644
|
||||
--- a/lib/guestfs.pod
|
||||
+++ b/lib/guestfs.pod
|
||||
@@ -715,70 +715,6 @@ servers. The server string is documented in
|
||||
L</guestfs_add_drive_opts>. The C<username> and C<secret> parameters are
|
||||
also optional, and if not given, then no authentication will be used.
|
||||
|
||||
-=head3 FTP, HTTP AND TFTP
|
||||
-
|
||||
-Libguestfs can access remote disks over FTP, FTPS, HTTP, HTTPS
|
||||
-or TFTP protocols.
|
||||
-
|
||||
-To do this, set the optional C<protocol> and C<server> parameters of
|
||||
-L</guestfs_add_drive_opts> like this:
|
||||
-
|
||||
- char **servers = { "www.example.org", NULL };
|
||||
- guestfs_add_drive_opts (g, "/disk.img",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "http",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_SERVER, servers,
|
||||
- -1);
|
||||
-
|
||||
-The C<protocol> can be one of C<"ftp">, C<"ftps">, C<"http">,
|
||||
-C<"https"> or C<"tftp">.
|
||||
-
|
||||
-C<servers> (the C<server> parameter) is a list which must have a
|
||||
-single element. The single element is a string defining the web,
|
||||
-FTP or TFTP server. The format of this string is documented in
|
||||
-L</guestfs_add_drive_opts>.
|
||||
-
|
||||
-=head3 GLUSTER
|
||||
-
|
||||
-Libguestfs can access Gluster disks.
|
||||
-
|
||||
-To do this, set the optional C<protocol> and C<server> parameters of
|
||||
-L</guestfs_add_drive_opts> like this:
|
||||
-
|
||||
- char **servers = { "gluster.example.org:24007", NULL };
|
||||
- guestfs_add_drive_opts (g, "volname/image",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "gluster",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_SERVER, servers,
|
||||
- -1);
|
||||
-
|
||||
-C<servers> (the C<server> parameter) is a list which must have a
|
||||
-single element. The single element is a string defining the Gluster
|
||||
-server. The format of this string is documented in
|
||||
-L</guestfs_add_drive_opts>.
|
||||
-
|
||||
-Note that gluster usually requires the client process (ie. libguestfs)
|
||||
-to run as B<root> and will give unfathomable errors if it is not
|
||||
-(eg. "No data available").
|
||||
-
|
||||
-=head3 ISCSI
|
||||
-
|
||||
-Libguestfs can access iSCSI disks remotely.
|
||||
-
|
||||
-To do this, set the optional C<protocol> and C<server> parameters like
|
||||
-this:
|
||||
-
|
||||
- char **server = { "iscsi.example.org:3000", NULL };
|
||||
- guestfs_add_drive_opts (g, "target-iqn-name/lun",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "iscsi",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_SERVER, server,
|
||||
- -1);
|
||||
-
|
||||
-The C<server> parameter is a list which must have a single element.
|
||||
-The single element is a string defining the iSCSI server. The format
|
||||
-of this string is documented in L</guestfs_add_drive_opts>.
|
||||
-
|
||||
=head3 NETWORK BLOCK DEVICE
|
||||
|
||||
Libguestfs can access Network Block Device (NBD) disks remotely.
|
||||
@@ -841,42 +777,6 @@ L<https://bugs.launchpad.net/qemu/+bug/1155677>
|
||||
|
||||
=back
|
||||
|
||||
-=head3 SHEEPDOG
|
||||
-
|
||||
-Libguestfs can access Sheepdog disks.
|
||||
-
|
||||
-To do this, set the optional C<protocol> and C<server> parameters of
|
||||
-L</guestfs_add_drive_opts> like this:
|
||||
-
|
||||
- char **servers = { /* optional servers ... */ NULL };
|
||||
- guestfs_add_drive_opts (g, "volume",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "sheepdog",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_SERVER, servers,
|
||||
- -1);
|
||||
-
|
||||
-The optional list of C<servers> may be zero or more server addresses
|
||||
-(C<"hostname:port">). The format of the server strings is documented
|
||||
-in L</guestfs_add_drive_opts>.
|
||||
-
|
||||
-=head3 SSH
|
||||
-
|
||||
-Libguestfs can access disks over a Secure Shell (SSH) connection.
|
||||
-
|
||||
-To do this, set the C<protocol> and C<server> and (optionally)
|
||||
-C<username> parameters of L</guestfs_add_drive_opts> like this:
|
||||
-
|
||||
- char **server = { "remote.example.com", NULL };
|
||||
- guestfs_add_drive_opts (g, "/path/to/disk.img",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "ssh",
|
||||
- GUESTFS_ADD_DRIVE_OPTS_SERVER, server,
|
||||
- GUESTFS_ADD_DRIVE_OPTS_USERNAME, "remoteuser",
|
||||
- -1);
|
||||
-
|
||||
-The format of the server string is documented in
|
||||
-L</guestfs_add_drive_opts>.
|
||||
-
|
||||
=head2 INSPECTION
|
||||
|
||||
Libguestfs has APIs for inspecting an unknown disk image to find out
|
||||
diff --git a/tests/disks/test-qemu-drive-libvirt.sh b/tests/disks/test-qemu-drive-libvirt.sh
|
||||
index 595a95a5e..b49534c94 100755
|
||||
--- a/tests/disks/test-qemu-drive-libvirt.sh
|
||||
+++ b/tests/disks/test-qemu-drive-libvirt.sh
|
||||
@@ -65,34 +65,6 @@ check_output
|
||||
grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail ceph2
|
||||
rm "$DEBUG_QEMU_FILE"
|
||||
|
||||
-# Gluster.
|
||||
-
|
||||
-$guestfish -d gluster run ||:
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=gluster://1.2.3.4:1234/volname/image,' "$DEBUG_QEMU_FILE" || fail gluster
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
-# iSCSI.
|
||||
-
|
||||
-$guestfish -d iscsi run ||:
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=iscsi://1.2.3.4:1234/iqn.2003-01.org.linux-iscsi.fedora' "$DEBUG_QEMU_FILE" || fail iscsi
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
-# NBD.
|
||||
-
|
||||
-$guestfish -d nbd run ||:
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=nbd:1.2.3.4:1234,' "$DEBUG_QEMU_FILE" || fail nbd
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
-# Sheepdog.
|
||||
-
|
||||
-$guestfish -d sheepdog run ||:
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=sheepdog:volume,' "$DEBUG_QEMU_FILE" || fail sheepdog
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
# Local, stored in a pool.
|
||||
|
||||
$guestfish -d pool1 run ||:
|
||||
diff --git a/tests/disks/test-qemu-drive.sh b/tests/disks/test-qemu-drive.sh
|
||||
index 12937fb30..b3e4f9903 100755
|
||||
--- a/tests/disks/test-qemu-drive.sh
|
||||
+++ b/tests/disks/test-qemu-drive.sh
|
||||
@@ -62,45 +62,6 @@ check_output
|
||||
grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail
|
||||
rm "$DEBUG_QEMU_FILE"
|
||||
|
||||
-# HTTP.
|
||||
-
|
||||
-guestfish <<EOF ||:
|
||||
- add "/disk.img" "format:raw" "protocol:http" "server:www.example.com"
|
||||
- run
|
||||
-EOF
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=http://www.example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
-# Gluster.
|
||||
-
|
||||
-guestfish <<EOF ||:
|
||||
- add "volname/image" "format:raw" "protocol:gluster" "server:www.example.com:24007"
|
||||
- run
|
||||
-EOF
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=gluster://www.example.com:24007/volname/image,' "$DEBUG_QEMU_FILE" || fail
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
-# iSCSI.
|
||||
-
|
||||
-guestfish <<EOF ||:
|
||||
- add "target-iqn-name/lun" "format:raw" "protocol:iscsi" "server:www.example.com:3000"
|
||||
- run
|
||||
-EOF
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=iscsi://www.example.com:3000/target-iqn-name/lun,' "$DEBUG_QEMU_FILE" || fail
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
-guestfish <<EOF ||:
|
||||
- add "target-iqn-name/lun" "format:raw" "protocol:iscsi" "server:www.example.com:3000" \
|
||||
- "username:user" "secret:pass"
|
||||
- run
|
||||
-EOF
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=iscsi://user%pass@www.example.com:3000/target-iqn-name/lun,' "$DEBUG_QEMU_FILE" || fail
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
# NBD.
|
||||
|
||||
guestfish <<EOF ||:
|
||||
@@ -118,24 +79,3 @@ EOF
|
||||
check_output
|
||||
grep -sq -- '-drive file=nbd:unix:/socket,' "$DEBUG_QEMU_FILE" || fail
|
||||
rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
-# Sheepdog.
|
||||
-
|
||||
-guestfish <<EOF ||:
|
||||
- add "volume" "format:raw" "protocol:sheepdog"
|
||||
- run
|
||||
-EOF
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=sheepdog:volume,' "$DEBUG_QEMU_FILE" || fail
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
-
|
||||
-# SSH.
|
||||
-
|
||||
-guestfish <<EOF ||:
|
||||
- add "/disk.img" "format:raw" "protocol:ssh" "server:example.com" \
|
||||
- "username:rich"
|
||||
- run
|
||||
-EOF
|
||||
-check_output
|
||||
-grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail
|
||||
-rm "$DEBUG_QEMU_FILE"
|
||||
--
|
||||
2.30.1
|
||||
|
||||
72
0004-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch
Normal file
72
0004-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
From 2cad9372eb4f3a1c37f254eb2e9af797693fa7d4 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 4/5] 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.30.1
|
||||
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
From f3fde497b6e0b079ff86360f6c0b6ef8d433c39b Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 7 Jul 2015 09:28:03 -0400
|
||||
Subject: [PATCH 5/5] RHEL: Reject use of libguestfs-winsupport features except
|
||||
for virt-* tools (RHBZ#1240276).
|
||||
|
||||
Fix the tests: it doesn't let us use guestfish for arbitrary Windows
|
||||
edits.
|
||||
---
|
||||
generator/c.ml | 16 ++++++++++++++++
|
||||
test-data/phony-guests/make-windows-img.sh | 1 +
|
||||
tests/charsets/test-charset-fidelity.c | 2 ++
|
||||
3 files changed, 19 insertions(+)
|
||||
|
||||
diff --git a/generator/c.ml b/generator/c.ml
|
||||
index 86d3b26f8..a625361a9 100644
|
||||
--- a/generator/c.ml
|
||||
+++ b/generator/c.ml
|
||||
@@ -1846,6 +1846,22 @@ and generate_client_actions actions () =
|
||||
check_args_validity c_name style;
|
||||
trace_call name c_name style;
|
||||
|
||||
+ (* RHEL 8 *)
|
||||
+ if name = "mount" || name = "mount_ro" || name = "mount_options" ||
|
||||
+ name = "mount_vfs" then (
|
||||
+ pr " if (g->program && !STRPREFIX (g->program, \"virt-\")) {\n";
|
||||
+ pr " CLEANUP_FREE char *vfs_type = guestfs_vfs_type (g, mountable);\n";
|
||||
+ pr " if (vfs_type && STREQ (vfs_type, \"ntfs\")) {\n";
|
||||
+ pr " error (g, \"mount: unsupported filesystem type\");\n";
|
||||
+ pr " if (trace_flag)\n";
|
||||
+ pr " guestfs_int_trace (g, \"%%s = %%s (error)\",\n";
|
||||
+ pr " \"%s\", \"-1\");\n" name;
|
||||
+ pr " return %s;\n" (string_of_errcode errcode);
|
||||
+ pr " }\n";
|
||||
+ pr " }\n";
|
||||
+ pr "\n";
|
||||
+ );
|
||||
+
|
||||
(* Calculate the total size of all FileIn arguments to pass
|
||||
* as a progress bar hint.
|
||||
*)
|
||||
diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh
|
||||
index 30908a918..73cf5144e 100755
|
||||
--- a/test-data/phony-guests/make-windows-img.sh
|
||||
+++ b/test-data/phony-guests/make-windows-img.sh
|
||||
@@ -37,6 +37,7 @@ fi
|
||||
|
||||
# Create a disk image.
|
||||
guestfish <<EOF
|
||||
+set-program virt-testing
|
||||
sparse windows.img-t 512M
|
||||
run
|
||||
|
||||
diff --git a/tests/charsets/test-charset-fidelity.c b/tests/charsets/test-charset-fidelity.c
|
||||
index 105291dc3..5ca4f3b6d 100644
|
||||
--- a/tests/charsets/test-charset-fidelity.c
|
||||
+++ b/tests/charsets/test-charset-fidelity.c
|
||||
@@ -96,6 +96,8 @@ main (int argc, char *argv[])
|
||||
if (g == NULL)
|
||||
error (EXIT_FAILURE, 0, "failed to create handle");
|
||||
|
||||
+ guestfs_set_program (g, "virt-testing");
|
||||
+
|
||||
if (guestfs_add_drive_scratch (g, 1024*1024*1024, -1) == -1)
|
||||
exit (EXIT_FAILURE);
|
||||
|
||||
--
|
||||
2.30.1
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-*
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional}
|
||||
|
|
|
|||
835
libguestfs.spec
835
libguestfs.spec
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +0,0 @@
|
|||
# Ignore copy-patches.sh. It is an internal script we use to
|
||||
# manage the patches.
|
||||
upstream:
|
||||
ignore:
|
||||
- copy-patches.sh
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (libguestfs-1.58.0.tar.gz) = 67abbd37fe64935ae5cca13dbe1860fe2eab9df492fd134eacbdc1831e6034c849855e76118ce0002d3ac83205122947582dbe47b66f12b94dcb51155881501a
|
||||
SHA512 (libguestfs-1.58.0.tar.gz.sig) = e07758ed3901f9ae95dace16cbb4de194dbbde788155efcde7982226785928d1805af6939f201d74770923ad55997f1d465f9594cb81bc2435c0ea882ce546d8
|
||||
SHA512 (libguestfs-1.46.2.tar.gz) = 6a7a77c72dc3120e40d6719e1d652d8d803df44355e1f1c22e7d787d051f4922b8a80be7a9f4a389f6c078c22f2c8349607695f67fa642c08c38aad6bf3416bc
|
||||
SHA512 (libguestfs-1.46.2.tar.gz.sig) = 30a335aee7fb024a8f9a28d5995ef42f64a895338f2ac0ece917c3bbdf79b20c11ce582e9341e31bbed6a9db11c082d3de4a1b8ada742efa87467d9a2223c350
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
#!/bin/bash -
|
||||
set -e
|
||||
set -x
|
||||
|
||||
# This only makes sure that libguestfs isn't totally broken.
|
||||
|
||||
# Fix libvirt.
|
||||
systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd
|
||||
|
||||
libguestfs-test-tool
|
||||
|
|
@ -5,10 +5,9 @@
|
|||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
required_packages:
|
||||
- libguestfs
|
||||
- libvirt-daemon-kvm
|
||||
tests:
|
||||
- libguestfs-test-tool:
|
||||
dir: .
|
||||
run: ./run-libguestfs-test-tool.sh
|
||||
run: libguestfs-test-tool
|
||||
required_packages:
|
||||
- libguestfs
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue