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

uuid: use newly introduced xfs_set_uuid of xfs

Browse Source 
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
This commit is contained in:
Chen Hanxiao
2015-06-30 19:23:10 +08:00
committed by Pino Toscano
parent ad21fb8acf
commit 5166388914
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/daemon.h
View File

@@ -262,6 +262,7 @@ extern int copy_xattrs (const char *src, const char *dest);
/*-- in xfs.c --*/
/* Documented in xfs_admin(8). */
#define XFS_LABEL_MAX 12
extern int xfs_set_uuid (const char *device, const char *uuid);
/*-- debug-bmap.c --*/
extern char *debug_bmap (const char *subcmd, size_t argc, char *const *const argv);

12
daemon/uuids.c
View File

@@ -27,7 +27,6 @@
#include "actions.h"
#include "optgroups.h"
GUESTFSD_EXT_CMD(str_xfs_admin, xfs_admin);
GUESTFSD_EXT_CMD(str_swaplabel, swaplabel);
static int
@@ -48,22 +47,13 @@ e2uuid (const char *device, const char *uuid)
static int
xfsuuid (const char *device, const char *uuid)
{
int r;
CLEANUP_FREE char *err = NULL;
/* Don't allow special values. */
if (STREQ (uuid, "nil") || STREQ (uuid, "generate")) {
reply_with_error ("xfs: invalid new UUID");
return -1;
}
r = command (NULL, &err, str_xfs_admin, "-U", uuid, device, NULL);
if (r == -1) {
reply_with_error ("%s", err);
return -1;
}
return 0;
return xfs_set_uuid (device, uuid);
}
static int

7
daemon/xfs.c
View File

@@ -455,6 +455,13 @@ do_xfs_growfs (const char *path,
return 0;
}
int
xfs_set_uuid (const char *device, const char *uuid)
{
optargs_bitmask = GUESTFS_XFS_ADMIN_UUID_BITMASK;
return do_xfs_admin (device, 0, 0, 0, 0, 0, NULL, uuid);
}
int
do_xfs_admin (const char *device,
int extunwritten, int imgfile, int v2log,