search for: vfs_label

...file in the host and attach it as a device." }; [["part_disk"; "/dev/sda"; "mbr"]; ["mkfs"; "ext2"; "/dev/sda1"; ""; "NOARG"; ""; ""; "test-label"]; ["vfs_label"; "/dev/sda1"]], "test-label"), []; + InitEmpty, IfAvailable "btrfs", TestResultString ( + [["part_disk"; "/dev/sda"; "mbr"]; + ["mkfs"; "btrfs"; "/dev/sda1"; ""; "NOARG...

...l"); > + ADD_ARG (argv, i, path_buf); > + ADD_ARG (argv, i, NULL); > + > + r = commandv (&out, &err, argv); > + if (r == -1) { > + reply_with_error ("%s: %s", path, err); > + return NULL; > + } > + > + return out; > +} There's vfs_label already as command to get the label of a filesystem, so this special case for btrfs should be added there (just like the ones done in set_label). Isn't blkid working on btrfs filesystems? From what I see, there is support for it already. > diff --git a/generator/actions.ml b/generator/acti...

...uot;), [] ]; shortdesc = "probe NTFS volume"; @@ -8543,7 +8543,11 @@ a file in the host and attach it as a device." }; tests = [ InitBasicFS, Always, TestResultString ( [["set_label"; "/dev/sda1"; "LTEST"]; - ["vfs_label"; "/dev/sda1"]], "LTEST"), [] + ["vfs_label"; "/dev/sda1"]], "LTEST"), []; + InitEmpty, Always, TestResultString ( + [["part_disk"; "/dev/sda"; "mbr"]; + ["mkfs"; "ext2&qu...

...quot;; ""; ""; ""; "false"; "LBL-TEST"; "NOARG"]; + ["xfs_admin"; "/dev/sda1"; ""; ""; ""; ""; ""; "LBL-TEST"; "NOARG"]; ["vfs_label"; "/dev/sda1"]], "LBL-TEST"), []; ]); shortdesc = "change parameters of an XFS filesystem"; -- 2.5.0

...ADD_ARG (argv, i, NULL); > > + > > + r = commandv (&out, &err, argv); > > + if (r == -1) { > > + reply_with_error ("%s: %s", path, err); > > + return NULL; > > + } > > + > > + return out; > > +} > > There's vfs_label already as command to get the label of a filesystem, > so this special case for btrfs should be added there (just like the > ones done in set_label). > > Isn't blkid working on btrfs filesystems? From what I see, there is > support for it already. Yes, blkid just works. I think...

...ot;]; > > > + ["mount"; "/dev/sda1"; "/"]; > > > + ["btrfs_filesystem_get_label"; "/";]], "label\n"), []; > > > + ]; > > > > This test bit would be good to be added to the tests of vfs_label, > > just with s/Always/IfAvailable "btrfs"/ so it is run only when btrfs > > is available. Feel free to send this bit (updated) anyway, also for patch 5. Thanks, -- Pino Toscano

...label of the existing * swap partition. *) - let uuid = g#vfs_uuid target in + let orig_uuid = g#vfs_uuid target in + let uuid = + match orig_uuid with + | "" -> None + | uuid -> Some uuid in let label = g#vfs_label target in - g#mkswap ~uuid ~label target + g#mkswap ?uuid ~label target; + (* Check whether the UUID could be set, and warn in case it + * changed. + *) + let new_uuid = g#vfs_uuid target in + if new_uuid <> orig_uuid then + warning...

...-btrfs-misc.pl > index 2fe7c59..b47caab 100755 > --- a/tests/btrfs/test-btrfs-misc.pl > +++ b/tests/btrfs/test-btrfs-misc.pl > @@ -20,6 +20,7 @@ > > use strict; > use warnings; > +use Errno; > > use Sys::Guestfs; > > @@ -47,5 +48,21 @@ my $label = $g->vfs_label ("/dev/sda1"); > die "unexpected label: expecting 'newlabel' but got '$label'" > unless $label eq "newlabel"; > > +# Setting btrfs UUID > +eval { > + $g->set_uuid ("/dev/sda1", "12345678-1234-1234-1234-1234...

...tly take a block device, but are arguably applicable to btrfs subvolumes. A subvolume doesn't have a label itself, but its root filesystem does. A btrfs subvolume can still be mounted by label, as long as the subvolume is also given. set_label: note that this would also affect other subvolumes vfs_label vfs_type vfs_uuid Device name mangling: These apis are used to return sanitised device names. I'm not 100% convinced we need to modify them. However, we may want additional apis which handle filesystem descriptors. canonical_device_name part_to_dev Misc: zerofree: only actually supports ex...

...t; > > +++ b/tests/btrfs/test-btrfs-misc.pl > > > @@ -20,6 +20,7 @@ > > > > > > use strict; > > > use warnings; > > > +use Errno; > > > > > > use Sys::Guestfs; > > > > > > @@ -47,5 +48,21 @@ my $label = $g->vfs_label ("/dev/sda1"); > > > die "unexpected label: expecting 'newlabel' but got '$label'" > > > unless $label eq "newlabel"; > > > > > > +# Setting btrfs UUID > > > +eval { > > > + $g->set_uuid...

This miscellaneous patch adds bindings for: - ntfsfix - ntfsclone - ntfslabel and unifies filesystem label setting through a single API 'set-label' which replaces 'set-e2label' and is also able to set labels on NTFS using the ntfslabel program. 'ntfsfix' has been added as a possible way to fix RHBZ#797760. However I have not found a way to fully fix this bug. See

...ote: curly brackets can be removed now. > else { > diff --git a/tests/btrfs/test-btrfs-misc.pl b/tests/btrfs/test-btrfs-misc.pl > index 2fe7c59..cd60990 100755 > --- a/tests/btrfs/test-btrfs-misc.pl > +++ b/tests/btrfs/test-btrfs-misc.pl > @@ -47,5 +47,11 @@ my $label = $g->vfs_label ("/dev/sda1"); > die "unexpected label: expecting 'newlabel' but got '$label'" > unless $label eq "newlabel"; > > +# Setting btrfs UUID > +$g->set_uuid ("/dev/sda1", "12345678-1234-1234-1234-123456789012");...

This series of patches fixes: https://bugzilla.redhat.com/show_bug.cgi?id=597112 -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

...> > --- a/tests/btrfs/test-btrfs-misc.pl > > +++ b/tests/btrfs/test-btrfs-misc.pl > > @@ -20,6 +20,7 @@ > > > > use strict; > > use warnings; > > +use Errno; > > > > use Sys::Guestfs; > > > > @@ -47,5 +48,21 @@ my $label = $g->vfs_label ("/dev/sda1"); > > die "unexpected label: expecting 'newlabel' but got '$label'" > > unless $label eq "newlabel"; > > > > +# Setting btrfs UUID > > +eval { > > + $g->set_uuid ("/dev/sda1", "...

...changed"); - r = -1; + r = btrfsuuid (device, uuid); } else { diff --git a/tests/btrfs/test-btrfs-misc.pl b/tests/btrfs/test-btrfs-misc.pl index 2fe7c59..cd60990 100755 --- a/tests/btrfs/test-btrfs-misc.pl +++ b/tests/btrfs/test-btrfs-misc.pl @@ -47,5 +47,11 @@ my $label = $g->vfs_label ("/dev/sda1"); die "unexpected label: expecting 'newlabel' but got '$label'" unless $label eq "newlabel"; +# Setting btrfs UUID +$g->set_uuid ("/dev/sda1", "12345678-1234-1234-1234-123456789012"); +my $uuid = $g->vfs_uu...

...ff --git a/tests/btrfs/test-btrfs-misc.pl b/tests/btrfs/test-btrfs-misc.pl index 2fe7c59..b47caab 100755 --- a/tests/btrfs/test-btrfs-misc.pl +++ b/tests/btrfs/test-btrfs-misc.pl @@ -20,6 +20,7 @@ use strict; use warnings; +use Errno; use Sys::Guestfs; @@ -47,5 +48,21 @@ my $label = $g->vfs_label ("/dev/sda1"); die "unexpected label: expecting 'newlabel' but got '$label'" unless $label eq "newlabel"; +# Setting btrfs UUID +eval { + $g->set_uuid ("/dev/sda1", "12345678-1234-1234-1234-123456789012"); +}; +# FIXME:...

...ff --git a/tests/btrfs/test-btrfs-misc.pl b/tests/btrfs/test-btrfs-misc.pl index 2fe7c59..b47caab 100755 --- a/tests/btrfs/test-btrfs-misc.pl +++ b/tests/btrfs/test-btrfs-misc.pl @@ -20,6 +20,7 @@ use strict; use warnings; +use Errno; use Sys::Guestfs; @@ -47,5 +48,21 @@ my $label = $g->vfs_label ("/dev/sda1"); die "unexpected label: expecting 'newlabel' but got '$label'" unless $label eq "newlabel"; +# Setting btrfs UUID +eval { + $g->set_uuid ("/dev/sda1", "12345678-1234-1234-1234-123456789012"); +}; +# FIXME:...

...ff --git a/tests/btrfs/test-btrfs-misc.pl b/tests/btrfs/test-btrfs-misc.pl index 2fe7c59..0643eeb 100755 --- a/tests/btrfs/test-btrfs-misc.pl +++ b/tests/btrfs/test-btrfs-misc.pl @@ -20,6 +20,7 @@ use strict; use warnings; +use Errno; use Sys::Guestfs; @@ -47,5 +48,25 @@ my $label = $g->vfs_label ("/dev/sda1"); die "unexpected label: expecting 'newlabel' but got '$label'" unless $label eq "newlabel"; +# Setting btrfs UUID +eval { + $g->set_uuid ("/dev/sda1", "12345678-1234-1234-1234-123456789012"); +}; + +my $er...

--- daemon/daemon.h | 1 + daemon/labels.c | 3 +++ daemon/swap.c | 21 +++++++++++++++++++++ generator/actions.ml | 4 ++++ 4 files changed, 29 insertions(+) diff --git a/daemon/daemon.h b/daemon/daemon.h index 79a5288..2379e31 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -254,6 +254,7 @@ extern int64_t ntfs_minimum_size (const char *device); /*-- in swap.c --*/

...ith_mounted target g#btrfs_filesystem_resize | XFSGrowFS -> with_mounted target g#xfs_growfs + | Mkswap -> + (* Rebuild the swap using the UUID and label of the existing + * swap partition. + *) + let uuid = g#vfs_uuid target in + let label = g#vfs_label target in + g#mkswap ~uuid ~label target in (* Expand partition content as required. *) diff --git a/resize/virt-resize.pod b/resize/virt-resize.pod index aa01849..2344056 100644 --- a/resize/virt-resize.pod +++ b/resize/virt-resize.pod @@ -398,6 +398,14 @@ Btrfs filesystems, if...