summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2010-04-08 16:07:32 +0100
committerRichard Jones <rjones@redhat.com>2010-04-08 16:07:32 +0100
commit50195d6ec4e893f894ef1bbf7af6eeda56f96600 (patch)
tree4dec25a45ec846f14392d6253b8f5501bb850a0a /src
parent0ce9b2bb9bcac61f7fb5dd2811d9b3b621f8309b (diff)
downloadlibguestfs-50195d6ec4e893f894ef1bbf7af6eeda56f96600.tar.gz
libguestfs-50195d6ec4e893f894ef1bbf7af6eeda56f96600.tar.xz
libguestfs-50195d6ec4e893f894ef1bbf7af6eeda56f96600.zip
New API calls to upload/download txz files (RHBZ#580556).
Diffstat (limited to 'src')
-rw-r--r--src/MAX_PROC_NR2
-rwxr-xr-xsrc/generator.ml22
2 files changed, 21 insertions, 3 deletions
diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR
index 9be0dc9a..dcb6b5ba 100644
--- a/src/MAX_PROC_NR
+++ b/src/MAX_PROC_NR
@@ -1 +1 @@
-228
+230
diff --git a/src/generator.ml b/src/generator.ml
index 416a66fd..9d190977 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -2025,7 +2025,8 @@ The checksum is returned as a printable string.");
This command uploads and unpacks local file C<tarfile> (an
I<uncompressed> tar file) into C<directory>.
-To upload a compressed tarball, use C<guestfs_tgz_in>.");
+To upload a compressed tarball, use C<guestfs_tgz_in>
+or C<guestfs_txz_in>.");
("tar_out", (RErr, [String "directory"; FileOut "tarfile"]), 70, [],
[],
@@ -2034,7 +2035,8 @@ To upload a compressed tarball, use C<guestfs_tgz_in>.");
This command packs the contents of C<directory> and downloads
it to local file C<tarfile>.
-To download a compressed tarball, use C<guestfs_tgz_out>.");
+To download a compressed tarball, use C<guestfs_tgz_out>
+or C<guestfs_txz_out>.");
("tgz_in", (RErr, [FileIn "tarball"; String "directory"]), 71, [],
[InitBasicFS, Always, TestOutput (
@@ -4355,6 +4357,22 @@ This command writes zeroes over the entire C<device>. Compare
with C<guestfs_zero> which just zeroes the first few blocks of
a device.");
+ ("txz_in", (RErr, [FileIn "tarball"; String "directory"]), 229, [],
+ [InitBasicFS, Always, TestOutput (
+ [["txz_in"; "../images/helloworld.tar.xz"; "/"];
+ ["cat"; "/hello"]], "hello\n")],
+ "unpack compressed tarball to directory",
+ "\
+This command uploads and unpacks local file C<tarball> (an
+I<xz compressed> tar file) into C<directory>.");
+
+ ("txz_out", (RErr, [Pathname "directory"; FileOut "tarball"]), 230, [],
+ [],
+ "pack directory into compressed tarball",
+ "\
+This command packs the contents of C<directory> and downloads
+it to local file C<tarball> (as an xz compressed tar archive).");
+
]
let all_functions = non_daemon_functions @ daemon_functions