summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO5
-rwxr-xr-xcat/virt-cat.pod3
-rwxr-xr-xcat/virt-filesystems.pod3
-rwxr-xr-xcat/virt-ls.pod3
-rwxr-xr-xdf/virt-df.pod3
-rw-r--r--fish/guestfish.pod2
-rw-r--r--fish/virt.c3
-rw-r--r--fuse/guestmount.pod2
-rwxr-xr-xinspector/virt-inspector.pod3
-rwxr-xr-xrescue/virt-rescue.pod3
10 files changed, 19 insertions, 11 deletions
diff --git a/TODO b/TODO
index 9364e12c..6579629f 100644
--- a/TODO
+++ b/TODO
@@ -432,11 +432,6 @@ guestfish drive letters
There should be an option to mount all Windows drives as separate
paths, like C: => /c/, D: => /d/ etc.
-Select machines by UUID
------------------------
-
-guestfish -u UUID <or> guestfish -d UUID
-
More inspection features
------------------------
diff --git a/cat/virt-cat.pod b/cat/virt-cat.pod
index 4ec9a0b4..af8b8f48 100755
--- a/cat/virt-cat.pod
+++ b/cat/virt-cat.pod
@@ -92,7 +92,8 @@ not used at all.
=item B<--domain> guest
-Add all the disks from the named libvirt guest.
+Add all the disks from the named libvirt guest. Domain UUIDs can be
+used instead of names.
=item B<--echo-keys>
diff --git a/cat/virt-filesystems.pod b/cat/virt-filesystems.pod
index fac139b1..3ba925f7 100755
--- a/cat/virt-filesystems.pod
+++ b/cat/virt-filesystems.pod
@@ -142,7 +142,8 @@ read L</NOTE ABOUT CSV FORMAT> below.
=item B<--domain> guest
-Add all the disks from the named libvirt guest.
+Add all the disks from the named libvirt guest. Domain UUIDs can be
+used instead of names.
=item B<--echo-keys>
diff --git a/cat/virt-ls.pod b/cat/virt-ls.pod
index 1ba7417e..dc3093aa 100755
--- a/cat/virt-ls.pod
+++ b/cat/virt-ls.pod
@@ -92,7 +92,8 @@ not used at all.
=item B<--domain> guest
-Add all the disks from the named libvirt guest.
+Add all the disks from the named libvirt guest. Domain UUIDs can be
+used instead of names.
=item B<--echo-keys>
diff --git a/df/virt-df.pod b/df/virt-df.pod
index d05596aa..e9f416c5 100755
--- a/df/virt-df.pod
+++ b/df/virt-df.pod
@@ -89,7 +89,8 @@ not used at all.
=item B<--domain> guest
-Add all the disks from the named libvirt guest.
+Add all the disks from the named libvirt guest. Domain UUIDs can be
+used instead of names.
=item B<--format=raw|qcow2|..>
diff --git a/fish/guestfish.pod b/fish/guestfish.pod
index 94deb9cc..77bf0ca3 100644
--- a/fish/guestfish.pod
+++ b/fish/guestfish.pod
@@ -199,6 +199,8 @@ Add disks from the named libvirt domain. If the I<--ro> option is
also used, then any libvirt domain can be used. However in write
mode, only libvirt domains which are shut down can be named here.
+Domain UUIDs can be used instead of names.
+
Using this flag is mostly equivalent to using the C<add-domain> command,
with C<readonly:true> if the I<--ro> flag was given, and
with C<format:...> if the I<--format:...> flag was given.
diff --git a/fish/virt.c b/fish/virt.c
index b14cee2b..486f098e 100644
--- a/fish/virt.c
+++ b/fish/virt.c
@@ -48,5 +48,8 @@ add_libvirt_drives (const char *guest)
optargs.live = 1;
}
+ optargs.bitmask |= GUESTFS_ADD_DOMAIN_ALLOWUUID_BITMASK;
+ optargs.allowuuid = 1;
+
return guestfs_add_domain_argv (g, guest, &optargs);
}
diff --git a/fuse/guestmount.pod b/fuse/guestmount.pod
index 9fbefcf3..6a2f39b7 100644
--- a/fuse/guestmount.pod
+++ b/fuse/guestmount.pod
@@ -93,6 +93,8 @@ Add disks from the named libvirt domain. If the I<--ro> option is
also used, then any libvirt domain can be used. However in write
mode, only libvirt domains which are shut down can be named here.
+Domain UUIDs can be used instead of names.
+
=item B<--dir-cache-timeout N>
Set the readdir cache timeout to I<N> seconds, the default being 60
diff --git a/inspector/virt-inspector.pod b/inspector/virt-inspector.pod
index 225e3f6f..2192b399 100755
--- a/inspector/virt-inspector.pod
+++ b/inspector/virt-inspector.pod
@@ -86,7 +86,8 @@ then libvirt is not used at all.
=item B<--domain> guest
-Add all the disks from the named libvirt guest.
+Add all the disks from the named libvirt guest. Domain UUIDs can be
+used instead of names.
=item B<--echo-keys>
diff --git a/rescue/virt-rescue.pod b/rescue/virt-rescue.pod
index f56acd00..81a24cfe 100755
--- a/rescue/virt-rescue.pod
+++ b/rescue/virt-rescue.pod
@@ -118,7 +118,8 @@ not used at all.
=item B<--domain> guest
-Add all the disks from the named libvirt guest.
+Add all the disks from the named libvirt guest. Domain UUIDs can be
+used instead of names.
=item B<--format=raw|qcow2|..>