search for: 06b33e9

...rogs v4.1 add support to change uuid of btrfs fs. Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- daemon/uuids.c | 19 +++++++++++++++++-- generator/actions.ml | 4 ++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/daemon/uuids.c b/daemon/uuids.c index 06b33e9..c18cb55 100644 --- a/daemon/uuids.c +++ b/daemon/uuids.c @@ -30,6 +30,7 @@ GUESTFSD_EXT_CMD(str_tune2fs, tune2fs); GUESTFSD_EXT_CMD(str_xfs_admin, xfs_admin); GUESTFSD_EXT_CMD(str_swaplabel, swaplabel); +GUESTFSD_EXT_CMD(str_btrfstune, btrfstune); static int e2uuid (const char *device, cons...

...in btrfs.c --*/ > extern char *btrfs_get_label (const char *device); > +extern int btrfstune_set_uuid (const char *device, const char *uuid); > > /*-- in ntfs.c --*/ > extern char *ntfs_get_label (const char *device); > diff --git a/daemon/uuids.c b/daemon/uuids.c > index 06b33e9..f7791ab 100644 > --- a/daemon/uuids.c > +++ b/daemon/uuids.c > @@ -91,6 +91,12 @@ swapuuid (const char *device, const char *uuid) > return 0; > } > > +static int > +btrfsuuid (const char *device, const char *uuid) > +{ > + return btrfstune_set_uuid (device, uui...

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- daemon/uuids.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon/uuids.c b/daemon/uuids.c index 431d867..06b33e9 100644 --- a/daemon/uuids.c +++ b/daemon/uuids.c @@ -110,6 +110,11 @@ do_set_uuid (const char *device, const char *uuid) else if (STREQ (vfs_type, "swap")) r = swapuuid (device, uuid); + else if (STREQ (vfs_type, "btrfs")) { + reply_with_error ("btrfs filesyst...

...1). > > Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> > --- > daemon/uuids.c | 19 +++++++++++++++++-- > generator/actions.ml | 4 ++++ > 2 files changed, 21 insertions(+), 2 deletions(-) > > diff --git a/daemon/uuids.c b/daemon/uuids.c > index 06b33e9..c18cb55 100644 > --- a/daemon/uuids.c > +++ b/daemon/uuids.c > @@ -30,6 +30,7 @@ > GUESTFSD_EXT_CMD(str_tune2fs, tune2fs); > GUESTFSD_EXT_CMD(str_xfs_admin, xfs_admin); > GUESTFSD_EXT_CMD(str_swaplabel, swaplabel); > +GUESTFSD_EXT_CMD(str_btrfstune, btrfstune); > >...

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- daemon/uuids.c | 19 +++++++++++++++++++ sysprep/sysprep_operation_fs_uuids.ml | 2 -- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/daemon/uuids.c b/daemon/uuids.c index 672f3db..431d867 100644 --- a/daemon/uuids.c +++ b/daemon/uuids.c @@ -29,6 +29,7 @@ GUESTFSD_EXT_CMD(str_tune2fs, tune2fs);

...ize_t argc, char *const *co /*-- in btrfs.c --*/ extern char *btrfs_get_label (const char *device); +extern int btrfstune_set_uuid (const char *device, const char *uuid); /*-- in ntfs.c --*/ extern char *ntfs_get_label (const char *device); diff --git a/daemon/uuids.c b/daemon/uuids.c index 06b33e9..f7791ab 100644 --- a/daemon/uuids.c +++ b/daemon/uuids.c @@ -91,6 +91,12 @@ swapuuid (const char *device, const char *uuid) return 0; } +static int +btrfsuuid (const char *device, const char *uuid) +{ + return btrfstune_set_uuid (device, uuid); +} + int do_set_uuid (const char *device, co...

...d, size_t argc, char *const *co /*-- in btrfs.c --*/ extern char *btrfs_get_label (const char *device); +extern int btrfs_set_uuid (const char *device, const char *uuid); /*-- in ntfs.c --*/ extern char *ntfs_get_label (const char *device); diff --git a/daemon/uuids.c b/daemon/uuids.c index 06b33e9..f98d8e5 100644 --- a/daemon/uuids.c +++ b/daemon/uuids.c @@ -110,10 +110,8 @@ do_set_uuid (const char *device, const char *uuid) else if (STREQ (vfs_type, "swap")) r = swapuuid (device, uuid); - else if (STREQ (vfs_type, "btrfs")) { - reply_with_error ("btrfs...

...d, size_t argc, char *const *co /*-- in btrfs.c --*/ extern char *btrfs_get_label (const char *device); +extern int btrfs_set_uuid (const char *device, const char *uuid); /*-- in ntfs.c --*/ extern char *ntfs_get_label (const char *device); diff --git a/daemon/uuids.c b/daemon/uuids.c index 06b33e9..f98d8e5 100644 --- a/daemon/uuids.c +++ b/daemon/uuids.c @@ -110,10 +110,8 @@ do_set_uuid (const char *device, const char *uuid) else if (STREQ (vfs_type, "swap")) r = swapuuid (device, uuid); - else if (STREQ (vfs_type, "btrfs")) { - reply_with_error ("btrfs...

...d, size_t argc, char *const *co /*-- in btrfs.c --*/ extern char *btrfs_get_label (const char *device); +extern int btrfs_set_uuid (const char *device, const char *uuid); /*-- in ntfs.c --*/ extern char *ntfs_get_label (const char *device); diff --git a/daemon/uuids.c b/daemon/uuids.c index 06b33e9..f98d8e5 100644 --- a/daemon/uuids.c +++ b/daemon/uuids.c @@ -110,10 +110,8 @@ do_set_uuid (const char *device, const char *uuid) else if (STREQ (vfs_type, "swap")) r = swapuuid (device, uuid); - else if (STREQ (vfs_type, "btrfs")) { - reply_with_error ("btrfs...

...n char *btrfs_get_label (const char *device); > > +extern int btrfstune_set_uuid (const char *device, const char *uuid); > > > > /*-- in ntfs.c --*/ > > extern char *ntfs_get_label (const char *device); > > diff --git a/daemon/uuids.c b/daemon/uuids.c > > index 06b33e9..f7791ab 100644 > > --- a/daemon/uuids.c > > +++ b/daemon/uuids.c > > @@ -91,6 +91,12 @@ swapuuid (const char *device, const char *uuid) > > return 0; > > } > > > > +static int > > +btrfsuuid (const char *device, const char *uuid) > > +{ &gt...

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - uuids.c did a lot of deplicated work for changing uuid of fs. Use existed functions. -- Introduce new API: btrfstune_set_uuid_random Chen Hanxiao (5): uuid: add support to change uuid of btrfs partition uuid: use existed function of ext2 uuid: use newly introduced

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v3: set errno if feature is not available. Chen Hanxiao (4): uuid: add support to change uuid of btrfs partition uuid: use existing function of ext2 uuid: use newly introduced

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (9): uuid: add support to change uuid of btrfs partition uuid: use existing function of

.../*-- in btrfs.c --*/ > extern char *btrfs_get_label (const char *device); > +extern int btrfs_set_uuid (const char *device, const char *uuid); > > /*-- in ntfs.c --*/ > extern char *ntfs_get_label (const char *device); > diff --git a/daemon/uuids.c b/daemon/uuids.c > index 06b33e9..f98d8e5 100644 > --- a/daemon/uuids.c > +++ b/daemon/uuids.c > @@ -110,10 +110,8 @@ do_set_uuid (const char *device, const char *uuid) > else if (STREQ (vfs_type, "swap")) > r = swapuuid (device, uuid); > > - else if (STREQ (vfs_type, "btrfs")) {...

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v4: introduce get_random_uuid improve testcases squash internal API patches v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (7):