mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

drives: ceph/gluster/iscsi/sheepdog/ssh: Force the disk name to begin with a '/'.

Browse Source 
This avoids confusion when using URIs in guestfish, since the path
will always start with a '/', and we don't otherwise know if we should
remove it or not.  By forcing the '/' to always be there, we deal with
this problem in the API instead.
This commit is contained in:
Richard W.M. Jones
2013-05-11 13:33:36 +01:00
parent 914d3e68ec
commit 0a065c4574
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fish/guestfish.pod
View File

@@ -1133,7 +1133,7 @@ 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
><fs> add /target-iqn-name/lun protocol:iscsi server:tcp:example.com
=head2 B<-a nbd://example.com[:port]>

35
src/drives.c
View File

@@ -261,6 +261,11 @@ create_drive_rbd (guestfs_h *g,
return NULL;
}
if (exportname[0] != '/') {
error (g, _("rbd: image name must begin with a '/'"));
return NULL;
}
return create_drive_non_file (g, drive_protocol_rbd,
servers, nr_servers, exportname,
username, secret,
@@ -306,6 +311,11 @@ create_drive_sheepdog (guestfs_h *g,
return NULL;
}
if (exportname[0] != '/') {
error (g, _("sheepdog: volume parameter must begin with a '/'"));
return NULL;
}
return create_drive_non_file (g, drive_protocol_sheepdog,
servers, nr_servers, exportname,
username, secret,
@@ -344,6 +354,11 @@ create_drive_ssh (guestfs_h *g,
return NULL;
}
if (exportname[0] != '/') {
error (g, _("sheepdog: pathname must begin with a '/'"));
return NULL;
}
if (username && STREQ (username, "")) {
error (g, _("ssh: username should not be an empty string"));
return NULL;
@@ -387,15 +402,16 @@ create_drive_iscsi (guestfs_h *g,
return NULL;
}
/* If the exportname begins with a '/', skip it. */
if (exportname[0] == '/')
exportname++;
if (STREQ (exportname, "")) {
error (g, _("iscsi: target name should not be an empty string"));
return NULL;
}
if (exportname[0] != '/') {
error (g, _("iscsi: target string must begin with a '/'"));
return NULL;
}
return create_drive_non_file (g, drive_protocol_iscsi,
servers, nr_servers, exportname,
username, secret,
@@ -1194,7 +1210,8 @@ guestfs___drive_source_qemu_param (guestfs_h *g, const struct drive_source *src)
if (STREQ (src->u.exportname, ""))
ret = safe_strdup (g, p);
else
ret = safe_asprintf (g, "%s:exportname=%s", p, src->u.exportname);
/* Skip the mandatory leading '/' character. */
ret = safe_asprintf (g, "%s:exportname=%s", p, &src->u.exportname[1]);
return ret;
}
@@ -1241,8 +1258,9 @@ guestfs___drive_source_qemu_param (guestfs_h *g, const struct drive_source *src)
else
auth = ":auth_supported=none";
/* Skip the mandatory leading '/' character on exportname. */
return safe_asprintf (g, "rbd:%s:mon_host=%s%s%s%s",
src->u.exportname,
&src->u.exportname[1],
mon_host,
username ? username : "",
auth,
@@ -1250,12 +1268,13 @@ guestfs___drive_source_qemu_param (guestfs_h *g, const struct drive_source *src)
}
case drive_protocol_sheepdog:
/* Skip the mandatory leading '/' character on exportname. */
if (src->nr_servers == 0)
return safe_asprintf (g, "sheepdog:%s", src->u.exportname);
return safe_asprintf (g, "sheepdog:%s", &src->u.exportname[1]);
else /* XXX How to pass multiple hosts? */
return safe_asprintf (g, "sheepdog:%s:%d:%s",
src->servers[0].u.hostname, src->servers[0].port,
src->u.exportname);
&src->u.exportname[1]);
case drive_protocol_ssh:
return make_uri (g, "ssh", src->username,

8
src/guestfs.pod
View File

@@ -648,7 +648,7 @@ To do this, set the optional C<protocol> and C<server> parameters of
L</guestfs_add_drive_opts> like this:
char **servers = { "ceph1.example.org:3000", /* ... */, NULL };
guestfs_add_drive_opts (g, "pool/image",
guestfs_add_drive_opts (g, "/pool/image",
GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "rbd",
GUESTFS_ADD_DRIVE_OPTS_SERVER, servers,
@@ -669,7 +669,7 @@ 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:3000", NULL };
guestfs_add_drive_opts (g, "volname/image",
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,
@@ -688,7 +688,7 @@ 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 (g, "/target-iqn-name/lun",
GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "iscsi",
GUESTFS_ADD_DRIVE_OPTS_SERVER, server,
@@ -768,7 +768,7 @@ 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 (g, "/volume",
GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "sheepdog",
GUESTFS_ADD_DRIVE_OPTS_SERVER, servers,