[Pkg-libvirt-commits] [libguestfs] 01/06: Imported Upstream version 1.15.11
Hilko Bengen
bengen at moszumanska.debian.org
Sun Dec 22 18:13:53 UTC 2013
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.15.11-1
in repository libguestfs.
commit 8cf9f9575e54c4f80dc7dd841fd32950e277ae5e
Author: Hilko Bengen <bengen at debian.org>
Date: Sun Dec 11 18:50:19 2011 +0100
Imported Upstream version 1.15.11
---
BUGS | 16 +-
ChangeLog | 48 ++++
Makefile.in | 1 +
align/Makefile.in | 1 +
appliance/Makefile.in | 1 +
capitests/Makefile.in | 1 +
capitests/tests.c | 513 +++++++++++++++++++++++++++++++++++--
cat/Makefile.in | 1 +
caution/Makefile.in | 1 +
clone/Makefile.in | 1 +
configure | 134 ++++++----
configure.ac | 6 +-
csharp/Makefile.in | 1 +
daemon/Makefile.in | 1 +
daemon/utimens.c | 23 +-
debian/changelog | 4 +-
df/Makefile.in | 1 +
edit/Makefile.in | 1 +
erlang/Makefile.in | 1 +
erlang/examples/Makefile.in | 1 +
examples/Makefile.in | 1 +
extratests/Makefile.in | 1 +
fish/Makefile.in | 1 +
fish/copy.c | 61 +++--
fish/inspect.c | 40 ++-
fuse/Makefile.in | 1 +
fuse/guestmount.c | 2 +-
generator/Makefile.in | 1 +
generator/generator_actions.ml | 27 +-
gnulib/lib/Makefile.in | 1 +
gnulib/tests/Makefile.in | 1 +
haskell/Makefile.in | 1 +
images/Makefile.in | 1 +
inspector/Makefile.in | 1 +
java/Makefile.in | 1 +
java/examples/Makefile.in | 1 +
libguestfs.pc | 2 +-
ocaml/Makefile.in | 1 +
ocaml/examples/Makefile.in | 1 +
perl/Makefile.in | 1 +
perl/examples/Makefile.in | 1 +
php/Makefile.in | 1 +
po-docs/Makefile.in | 1 +
po-docs/ja/Makefile.in | 1 +
po-docs/ja/guestfish.1 | 2 +-
po-docs/ja/guestfs.3 | 2 +-
po-docs/ja/guestmount.1 | 2 +-
po-docs/ja/libguestfs-test-tool.1 | 2 +-
po-docs/ja/virt-alignment-scan.1 | 2 +-
po-docs/ja/virt-cat.1 | 2 +-
po-docs/ja/virt-copy-in.1 | 2 +-
po-docs/ja/virt-copy-out.1 | 2 +-
po-docs/ja/virt-df.1 | 2 +-
po-docs/ja/virt-edit.1 | 2 +-
po-docs/ja/virt-filesystems.1 | 2 +-
po-docs/ja/virt-inspector.1 | 2 +-
po-docs/ja/virt-list-filesystems.1 | 2 +-
po-docs/ja/virt-list-partitions.1 | 2 +-
po-docs/ja/virt-ls.1 | 2 +-
po-docs/ja/virt-make-fs.1 | 2 +-
po-docs/ja/virt-rescue.1 | 2 +-
po-docs/ja/virt-resize.1 | 2 +-
po-docs/ja/virt-sparsify.1 | 2 +-
po-docs/ja/virt-sysprep.1 | 2 +-
po-docs/ja/virt-tar-in.1 | 2 +-
po-docs/ja/virt-tar-out.1 | 2 +-
po-docs/ja/virt-tar.1 | 2 +-
po-docs/ja/virt-win-reg.1 | 2 +-
po-docs/libguestfs-docs.pot | 4 +-
po-docs/uk/Makefile.in | 1 +
po-docs/uk/guestfish.1 | 2 +-
po-docs/uk/guestfs.3 | 2 +-
po-docs/uk/guestmount.1 | 2 +-
po-docs/uk/libguestfs-test-tool.1 | 2 +-
po-docs/uk/virt-alignment-scan.1 | 2 +-
po-docs/uk/virt-cat.1 | 2 +-
po-docs/uk/virt-copy-in.1 | 2 +-
po-docs/uk/virt-copy-out.1 | 2 +-
po-docs/uk/virt-df.1 | 2 +-
po-docs/uk/virt-edit.1 | 2 +-
po-docs/uk/virt-filesystems.1 | 2 +-
po-docs/uk/virt-inspector.1 | 2 +-
po-docs/uk/virt-list-filesystems.1 | 2 +-
po-docs/uk/virt-list-partitions.1 | 2 +-
po-docs/uk/virt-ls.1 | 2 +-
po-docs/uk/virt-make-fs.1 | 2 +-
po-docs/uk/virt-rescue.1 | 2 +-
po-docs/uk/virt-resize.1 | 2 +-
po-docs/uk/virt-sparsify.1 | 2 +-
po-docs/uk/virt-sysprep.1 | 2 +-
po-docs/uk/virt-tar-in.1 | 2 +-
po-docs/uk/virt-tar-out.1 | 2 +-
po-docs/uk/virt-tar.1 | 2 +-
po-docs/uk/virt-win-reg.1 | 2 +-
po/en_GB.gmo | Bin 10781 -> 10781 bytes
po/en_GB.po | 56 +++-
po/es.gmo | Bin 92709 -> 92388 bytes
po/es.po | 69 +++--
po/gu.gmo | Bin 53605 -> 53417 bytes
po/gu.po | 61 +++--
po/hi.gmo | Bin 43389 -> 43389 bytes
po/hi.po | 56 +++-
po/kn.gmo | Bin 52822 -> 52822 bytes
po/kn.po | 56 +++-
po/libguestfs.pot | 58 +++--
po/ml.gmo | Bin 56355 -> 56355 bytes
po/ml.po | 56 +++-
po/mr.gmo | Bin 104937 -> 104538 bytes
po/mr.po | 67 +++--
po/nl.gmo | Bin 90946 -> 90664 bytes
po/nl.po | 68 +++--
po/or.gmo | Bin 52173 -> 52173 bytes
po/or.po | 56 +++-
po/pa.gmo | Bin 90834 -> 90436 bytes
po/pa.po | 67 +++--
po/pl.gmo | Bin 95389 -> 95101 bytes
po/pl.po | 67 +++--
po/ta.gmo | Bin 47311 -> 47311 bytes
po/ta.po | 56 +++-
po/te.gmo | Bin 49970 -> 49970 bytes
po/te.po | 56 +++-
po/uk.gmo | Bin 125123 -> 124716 bytes
po/uk.po | 69 +++--
python/Makefile.in | 1 +
python/examples/Makefile.in | 1 +
regressions/Makefile.in | 1 +
rescue/Makefile.in | 1 +
resize/Makefile.in | 1 +
ruby/Makefile.am | 11 +-
ruby/Makefile.in | 12 +-
ruby/Rakefile.in | 2 +-
ruby/examples/Makefile.in | 1 +
ruby/run-bindtests | 2 +-
ruby/run-ruby-tests | 4 +-
sparsify/Makefile.in | 1 +
src/Makefile.in | 1 +
test-tool/Makefile.in | 1 +
tools/Makefile.in | 1 +
138 files changed, 1551 insertions(+), 417 deletions(-)
diff --git a/BUGS b/BUGS
index 36e7fba..a1dc227 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2011-12-06
+Last updated: 2011-12-09
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -65,14 +65,11 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
760221 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760221
RFE: Support inspection of cciss devices
-760223 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760223
- RFE: Support inspection of MD devices
-
-760244 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760244
- RFE: Support inspection of cciss devices
+761565 NEW https://bugzilla.redhat.com/show_bug.cgi?id=761565
+ Missing deps on netpbm-progs and icoutils
-760245 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760245
- RFE: Support inspection of MD devices
+765814 NEW https://bugzilla.redhat.com/show_bug.cgi?id=765814
+ root can't access user mounted images
563450 NEW https://bugzilla.redhat.com/show_bug.cgi?id=563450
list-devices returns devices of different types out of order
@@ -189,6 +186,9 @@ You can help by testing the fixes.
760000 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=760000
libguestfs fails to compile with Ruby >= 1.9
+760245 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=760245
+ RFE: Support inspection of MD devices
+
657499 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=657499
checksum: wrong check sum type causes umount to fail
diff --git a/ChangeLog b/ChangeLog
index f15b4e6..a204ae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+2011-12-09 Richard W.M. Jones <rjones at redhat.com>
+
+ fuse: Return EXIT_FAILURE if fuse_main fails.
+ fuse_main can return any non-zero value on error. In particular on
+ certain sorts of error such as unsupported -o options it returns 1
+ (not -1).
+
+ Therefore make sure any non-zero return is turned into EXIT_FAILURE.
+
+ (Thanks Pádraig Brady)
+
+ fish: -i option should fail if / is not mountable, but warn about others.
+ In particular this stops a problem with guestmount where if the -i
+ option half-recognizes the guest OS, it would mount the disk (and
+ fail, giving only warnings), leaving the mountpoint unusable.
+
+ (Thanks Pádraig Brady)
+
+2011-12-08 Richard W.M. Jones <rjones at redhat.com>
+
+ daemon: Fix utimens so it doesn't hang on named pipes (RHBZ#761460).
+ This also adds comprehensive tests for utimens on regular files,
+ directories (RHBZ#761451), named pipes (RHBZ#761460), symbolic links,
+ block and char devices.
+
+ Note that there is a small change in the (previously undefined)
+ semantics of this call: It now sets the time on a symbolic link
+ itself, not on what the symbolic link points to.
+
+ daemon: Allow utimens to work for directories (RHBZ#761451).
+ You don't need to open the file O_WRONLY in order to call futimens on
+ the file descriptor. Opening it O_WRONLY fails for directories.
+ Therefore open O_RDONLY instead.
+
+2011-12-07 Richard W.M. Jones <rjones at redhat.com>
+
+ copy-in/copy-out: Wait for the tar subprocess only (RHBZ#760669).
+
+ fish: Improve error messages when no OS / multi-boot OS found with inspection (RHBZ#760775).
+
+2011-12-06 Hilko Bengen <bengen at hilluzination.de>
+
+ let the user explicitly choose ruby and rake programs
+
+2011-12-06 Richard W.M. Jones <rjones at redhat.com>
+
+ Version 1.15.10.
+
2011-12-06 Hilko Bengen <bengen at hilluzination.de>
Fix rpcgen post-processing for out-of-tree builds
diff --git a/Makefile.in b/Makefile.in
index c07b72f..c40c362 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1217,6 +1217,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/align/Makefile.in b/align/Makefile.in
index 0a48a3b..ae53fc5 100644
--- a/align/Makefile.in
+++ b/align/Makefile.in
@@ -1172,6 +1172,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/appliance/Makefile.in b/appliance/Makefile.in
index 01c2024..9723600 100644
--- a/appliance/Makefile.in
+++ b/appliance/Makefile.in
@@ -1125,6 +1125,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/capitests/Makefile.in b/capitests/Makefile.in
index 41eabd3..4431124 100644
--- a/capitests/Makefile.in
+++ b/capitests/Makefile.in
@@ -1221,6 +1221,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/capitests/tests.c b/capitests/tests.c
index bab80ef..251e90e 100644
--- a/capitests/tests.c
+++ b/capitests/tests.c
@@ -3343,10 +3343,10 @@ static int test_vfs_uuid_0 (void)
return -1;
}
/* TestOutput for vfs_uuid (0) */
- const char *expected = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *expected = "dbc9946e-23c6-0cf1-c265-6127d811294d";
{
const char *device = "/dev/sda1";
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
int r;
suppress_error = 0;
r = guestfs_set_e2uuid (g, device, uuid);
@@ -7008,7 +7008,7 @@ static int test_utimens_0 (void)
}
/* TestOutputStruct for utimens (0) */
{
- const char *path = "/utimens";
+ const char *path = "/utimens-file";
int r;
suppress_error = 0;
r = guestfs_touch (g, path);
@@ -7016,7 +7016,7 @@ static int test_utimens_0 (void)
return -1;
}
{
- const char *path = "/utimens";
+ const char *path = "/utimens-file";
int r;
suppress_error = 0;
r = guestfs_utimens (g, path, 12345, 67890, 9876, 5432);
@@ -7024,7 +7024,7 @@ static int test_utimens_0 (void)
return -1;
}
{
- const char *path = "/utimens";
+ const char *path = "/utimens-file";
struct guestfs_stat *r;
suppress_error = 0;
r = guestfs_stat (g, path);
@@ -7040,6 +7040,447 @@ static int test_utimens_0 (void)
return 0;
}
+static int test_utimens_1_skip (void)
+{
+ const char *str;
+
+ str = getenv ("TEST_ONLY");
+ if (str)
+ return strstr (str, "utimens") == NULL;
+ str = getenv ("SKIP_TEST_UTIMENS_1");
+ if (str && STREQ (str, "1")) return 1;
+ str = getenv ("SKIP_TEST_UTIMENS");
+ if (str && STREQ (str, "1")) return 1;
+ return 0;
+}
+
+static int test_utimens_1 (void)
+{
+ if (test_utimens_1_skip ()) {
+ printf (" %s skipped (reason: environment variable set)\n", "test_utimens_1");
+ return 0;
+ }
+
+ /* InitScratchFS for test_utimens_1 */
+ {
+ const char *device = "/dev/sda";
+ int r;
+ suppress_error = 0;
+ r = guestfs_blockdev_setrw (g, device);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_umount_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_lvm_remove_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *options = "";
+ const char *device = "/dev/sdb1";
+ const char *mountpoint = "/";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mount_options (g, options, device, mountpoint);
+ if (r == -1)
+ return -1;
+ }
+ /* TestOutputStruct for utimens (1) */
+ {
+ const char *path = "/utimens-dir";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mkdir (g, path);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-dir";
+ int r;
+ suppress_error = 0;
+ r = guestfs_utimens (g, path, 12345, 67890, 9876, 5432);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-dir";
+ struct guestfs_stat *r;
+ suppress_error = 0;
+ r = guestfs_stat (g, path);
+ if (r == NULL)
+ return -1;
+ if (r->mtime != 9876) {
+ fprintf (stderr, "test_utimens_1: mtime was %d, expected 9876\n",
+ (int) r->mtime);
+ return -1;
+ }
+ guestfs_free_stat (r);
+ }
+ return 0;
+}
+
+static int test_utimens_2_skip (void)
+{
+ const char *str;
+
+ str = getenv ("TEST_ONLY");
+ if (str)
+ return strstr (str, "utimens") == NULL;
+ str = getenv ("SKIP_TEST_UTIMENS_2");
+ if (str && STREQ (str, "1")) return 1;
+ str = getenv ("SKIP_TEST_UTIMENS");
+ if (str && STREQ (str, "1")) return 1;
+ return 0;
+}
+
+static int test_utimens_2 (void)
+{
+ if (test_utimens_2_skip ()) {
+ printf (" %s skipped (reason: environment variable set)\n", "test_utimens_2");
+ return 0;
+ }
+
+ /* InitScratchFS for test_utimens_2 */
+ {
+ const char *device = "/dev/sda";
+ int r;
+ suppress_error = 0;
+ r = guestfs_blockdev_setrw (g, device);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_umount_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_lvm_remove_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *options = "";
+ const char *device = "/dev/sdb1";
+ const char *mountpoint = "/";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mount_options (g, options, device, mountpoint);
+ if (r == -1)
+ return -1;
+ }
+ /* TestOutputStruct for utimens (2) */
+ {
+ const char *path = "/utimens-fifo";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mkfifo (g, 420, path);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-fifo";
+ int r;
+ suppress_error = 0;
+ r = guestfs_utimens (g, path, 12345, 67890, 9876, 5432);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-fifo";
+ struct guestfs_stat *r;
+ suppress_error = 0;
+ r = guestfs_stat (g, path);
+ if (r == NULL)
+ return -1;
+ if (r->mtime != 9876) {
+ fprintf (stderr, "test_utimens_2: mtime was %d, expected 9876\n",
+ (int) r->mtime);
+ return -1;
+ }
+ guestfs_free_stat (r);
+ }
+ return 0;
+}
+
+static int test_utimens_3_skip (void)
+{
+ const char *str;
+
+ str = getenv ("TEST_ONLY");
+ if (str)
+ return strstr (str, "utimens") == NULL;
+ str = getenv ("SKIP_TEST_UTIMENS_3");
+ if (str && STREQ (str, "1")) return 1;
+ str = getenv ("SKIP_TEST_UTIMENS");
+ if (str && STREQ (str, "1")) return 1;
+ return 0;
+}
+
+static int test_utimens_3 (void)
+{
+ if (test_utimens_3_skip ()) {
+ printf (" %s skipped (reason: environment variable set)\n", "test_utimens_3");
+ return 0;
+ }
+
+ /* InitScratchFS for test_utimens_3 */
+ {
+ const char *device = "/dev/sda";
+ int r;
+ suppress_error = 0;
+ r = guestfs_blockdev_setrw (g, device);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_umount_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_lvm_remove_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *options = "";
+ const char *device = "/dev/sdb1";
+ const char *mountpoint = "/";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mount_options (g, options, device, mountpoint);
+ if (r == -1)
+ return -1;
+ }
+ /* TestOutputStruct for utimens (3) */
+ {
+ const char *target = "/utimens-file";
+ const char *linkname = "/utimens-link";
+ int r;
+ suppress_error = 0;
+ r = guestfs_ln_sf (g, target, linkname);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-link";
+ int r;
+ suppress_error = 0;
+ r = guestfs_utimens (g, path, 12345, 67890, 9876, 5432);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-link";
+ struct guestfs_stat *r;
+ suppress_error = 0;
+ r = guestfs_stat (g, path);
+ if (r == NULL)
+ return -1;
+ if (r->mtime != 9876) {
+ fprintf (stderr, "test_utimens_3: mtime was %d, expected 9876\n",
+ (int) r->mtime);
+ return -1;
+ }
+ guestfs_free_stat (r);
+ }
+ return 0;
+}
+
+static int test_utimens_4_skip (void)
+{
+ const char *str;
+
+ str = getenv ("TEST_ONLY");
+ if (str)
+ return strstr (str, "utimens") == NULL;
+ str = getenv ("SKIP_TEST_UTIMENS_4");
+ if (str && STREQ (str, "1")) return 1;
+ str = getenv ("SKIP_TEST_UTIMENS");
+ if (str && STREQ (str, "1")) return 1;
+ return 0;
+}
+
+static int test_utimens_4 (void)
+{
+ if (test_utimens_4_skip ()) {
+ printf (" %s skipped (reason: environment variable set)\n", "test_utimens_4");
+ return 0;
+ }
+
+ /* InitScratchFS for test_utimens_4 */
+ {
+ const char *device = "/dev/sda";
+ int r;
+ suppress_error = 0;
+ r = guestfs_blockdev_setrw (g, device);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_umount_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_lvm_remove_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *options = "";
+ const char *device = "/dev/sdb1";
+ const char *mountpoint = "/";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mount_options (g, options, device, mountpoint);
+ if (r == -1)
+ return -1;
+ }
+ /* TestOutputStruct for utimens (4) */
+ {
+ const char *path = "/utimens-block";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mknod_b (g, 420, 8, 0, path);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-block";
+ int r;
+ suppress_error = 0;
+ r = guestfs_utimens (g, path, 12345, 67890, 9876, 5432);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-block";
+ struct guestfs_stat *r;
+ suppress_error = 0;
+ r = guestfs_stat (g, path);
+ if (r == NULL)
+ return -1;
+ if (r->mtime != 9876) {
+ fprintf (stderr, "test_utimens_4: mtime was %d, expected 9876\n",
+ (int) r->mtime);
+ return -1;
+ }
+ guestfs_free_stat (r);
+ }
+ return 0;
+}
+
+static int test_utimens_5_skip (void)
+{
+ const char *str;
+
+ str = getenv ("TEST_ONLY");
+ if (str)
+ return strstr (str, "utimens") == NULL;
+ str = getenv ("SKIP_TEST_UTIMENS_5");
+ if (str && STREQ (str, "1")) return 1;
+ str = getenv ("SKIP_TEST_UTIMENS");
+ if (str && STREQ (str, "1")) return 1;
+ return 0;
+}
+
+static int test_utimens_5 (void)
+{
+ if (test_utimens_5_skip ()) {
+ printf (" %s skipped (reason: environment variable set)\n", "test_utimens_5");
+ return 0;
+ }
+
+ /* InitScratchFS for test_utimens_5 */
+ {
+ const char *device = "/dev/sda";
+ int r;
+ suppress_error = 0;
+ r = guestfs_blockdev_setrw (g, device);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_umount_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ int r;
+ suppress_error = 0;
+ r = guestfs_lvm_remove_all (g);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *options = "";
+ const char *device = "/dev/sdb1";
+ const char *mountpoint = "/";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mount_options (g, options, device, mountpoint);
+ if (r == -1)
+ return -1;
+ }
+ /* TestOutputStruct for utimens (5) */
+ {
+ const char *path = "/utimens-char";
+ int r;
+ suppress_error = 0;
+ r = guestfs_mknod_c (g, 420, 1, 3, path);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-char";
+ int r;
+ suppress_error = 0;
+ r = guestfs_utimens (g, path, 12345, 67890, 9876, 5432);
+ if (r == -1)
+ return -1;
+ }
+ {
+ const char *path = "/utimens-char";
+ struct guestfs_stat *r;
+ suppress_error = 0;
+ r = guestfs_stat (g, path);
+ if (r == NULL)
+ return -1;
+ if (r->mtime != 9876) {
+ fprintf (stderr, "test_utimens_5: mtime was %d, expected 9876\n",
+ (int) r->mtime);
+ return -1;
+ }
+ guestfs_free_stat (r);
+ }
+ return 0;
+}
+
static int test_truncate_size_0_skip (void)
{
const char *str;
@@ -8062,7 +8503,7 @@ static int test_mke2journal_U_0 (void)
return -1;
}
{
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
const char *device = "/dev/sda1";
int r;
suppress_error = 0;
@@ -8073,7 +8514,7 @@ static int test_mke2journal_U_0 (void)
{
const char *fstype = "ext2";
const char *device = "/dev/sda2";
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
int r;
suppress_error = 0;
r = guestfs_mke2fs_JU (g, fstype, 4096, device, uuid);
@@ -9081,7 +9522,7 @@ static int test_swapon_uuid_0 (void)
}
/* TestRun for swapon_uuid (0) */
{
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
const char *device = "/dev/sdc";
int r;
suppress_error = 0;
@@ -9090,7 +9531,7 @@ static int test_swapon_uuid_0 (void)
return -1;
}
{
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
int r;
suppress_error = 0;
r = guestfs_swapon_uuid (g, uuid);
@@ -9098,7 +9539,7 @@ static int test_swapon_uuid_0 (void)
return -1;
}
{
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
int r;
suppress_error = 0;
r = guestfs_swapoff_uuid (g, uuid);
@@ -12212,7 +12653,7 @@ static int test_mkswap_U_0 (void)
return -1;
}
{
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
const char *device = "/dev/sda1";
int r;
suppress_error = 0;
@@ -17715,7 +18156,7 @@ static int test_get_e2uuid_0 (void)
return -1;
}
/* TestOutput for get_e2uuid (0) */
- const char *expected = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *expected = "dbc9946e-23c6-0cf1-c265-6127d811294d";
{
const char *device = "/dev/sdc";
int r;
@@ -17726,7 +18167,7 @@ static int test_get_e2uuid_0 (void)
}
{
const char *device = "/dev/sdc";
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
int r;
suppress_error = 0;
r = guestfs_set_e2uuid (g, device, uuid);
@@ -17822,10 +18263,10 @@ static int test_set_e2uuid_0 (void)
return -1;
}
/* TestOutput for set_e2uuid (0) */
- const char *expected = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *expected = "dbc9946e-23c6-0cf1-c265-6127d811294d";
{
const char *device = "/dev/sda1";
- const char *uuid = "108d98f7-0fd6-7a41-fb19-c52406445a47";
+ const char *uuid = "dbc9946e-23c6-0cf1-c265-6127d811294d";
int r;
suppress_error = 0;
r = guestfs_set_e2uuid (g, device, uuid);
@@ -31069,7 +31510,7 @@ int main (int argc, char *argv[])
exit (EXIT_FAILURE);
}
- nr_tests = 336;
+ nr_tests = 341;
test_num++;
if (guestfs_get_verbose (g))
@@ -31698,6 +32139,46 @@ int main (int argc, char *argv[])
test_num++;
if (guestfs_get_verbose (g))
printf ("-------------------------------------------------------------------------------\n");
+ printf ("%3d/%3d test_utimens_1\n", test_num, nr_tests);
+ if (test_utimens_1 () == -1) {
+ printf ("test_utimens_1 FAILED\n");
+ n_failed++;
+ }
+ test_num++;
+ if (guestfs_get_verbose (g))
+ printf ("-------------------------------------------------------------------------------\n");
+ printf ("%3d/%3d test_utimens_2\n", test_num, nr_tests);
+ if (test_utimens_2 () == -1) {
+ printf ("test_utimens_2 FAILED\n");
+ n_failed++;
+ }
+ test_num++;
+ if (guestfs_get_verbose (g))
+ printf ("-------------------------------------------------------------------------------\n");
+ printf ("%3d/%3d test_utimens_3\n", test_num, nr_tests);
+ if (test_utimens_3 () == -1) {
+ printf ("test_utimens_3 FAILED\n");
+ n_failed++;
+ }
+ test_num++;
+ if (guestfs_get_verbose (g))
+ printf ("-------------------------------------------------------------------------------\n");
+ printf ("%3d/%3d test_utimens_4\n", test_num, nr_tests);
+ if (test_utimens_4 () == -1) {
+ printf ("test_utimens_4 FAILED\n");
+ n_failed++;
+ }
+ test_num++;
+ if (guestfs_get_verbose (g))
+ printf ("-------------------------------------------------------------------------------\n");
+ printf ("%3d/%3d test_utimens_5\n", test_num, nr_tests);
+ if (test_utimens_5 () == -1) {
+ printf ("test_utimens_5 FAILED\n");
+ n_failed++;
+ }
+ test_num++;
+ if (guestfs_get_verbose (g))
+ printf ("-------------------------------------------------------------------------------\n");
printf ("%3d/%3d test_truncate_size_0\n", test_num, nr_tests);
if (test_truncate_size_0 () == -1) {
printf ("test_truncate_size_0 FAILED\n");
diff --git a/cat/Makefile.in b/cat/Makefile.in
index 2c3e3c6..6bcc62e 100644
--- a/cat/Makefile.in
+++ b/cat/Makefile.in
@@ -1196,6 +1196,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/caution/Makefile.in b/caution/Makefile.in
index f3942ad..a14a86c 100644
--- a/caution/Makefile.in
+++ b/caution/Makefile.in
@@ -1108,6 +1108,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/clone/Makefile.in b/clone/Makefile.in
index a20d120..5c3f5b3 100644
--- a/clone/Makefile.in
+++ b/clone/Makefile.in
@@ -1132,6 +1132,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/configure b/configure
index b51d13b..f948dd0 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libguestfs 1.15.10.
+# Generated by GNU Autoconf 2.68 for libguestfs 1.15.11.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libguestfs'
PACKAGE_TARNAME='libguestfs'
-PACKAGE_VERSION='1.15.10'
-PACKAGE_STRING='libguestfs 1.15.10'
+PACKAGE_VERSION='1.15.11'
+PACKAGE_STRING='libguestfs 1.15.11'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -657,6 +657,7 @@ JAVA_HOME
HAVE_RUBY_FALSE
HAVE_RUBY_TRUE
RAKE
+RUBY
HAVE_PYTHON_FALSE
HAVE_PYTHON_TRUE
PYTHON_INSTALLDIR
@@ -2292,7 +2293,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libguestfs 1.15.10 to adapt to many kinds of systems.
+\`configure' configures libguestfs 1.15.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2362,7 +2363,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libguestfs 1.15.10:";;
+ short | recursive ) echo "Configuration of libguestfs 1.15.11:";;
esac
cat <<\_ACEOF
@@ -2535,7 +2536,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libguestfs configure 1.15.10
+libguestfs configure 1.15.11
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3277,7 +3278,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libguestfs $as_me 1.15.10, which was
+It was created by libguestfs $as_me 1.15.11, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -4175,7 +4176,7 @@ fi
# Define the identity of the package.
PACKAGE='libguestfs'
- VERSION='1.15.10'
+ VERSION='1.15.11'
cat >>confdefs.h <<_ACEOF
@@ -4272,8 +4273,8 @@ else
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: libguestfs version 1.15.10$libguestfs_extra" >&5
-$as_echo "$as_me: libguestfs version 1.15.10$libguestfs_extra" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: libguestfs version 1.15.11$libguestfs_extra" >&5
+$as_echo "$as_me: libguestfs version 1.15.11$libguestfs_extra" >&6;}
$as_echo "#define PACKAGE_VERSION_MAJOR 1" >>confdefs.h
@@ -4282,7 +4283,7 @@ $as_echo "#define PACKAGE_VERSION_MAJOR 1" >>confdefs.h
$as_echo "#define PACKAGE_VERSION_MINOR 15" >>confdefs.h
-$as_echo "#define PACKAGE_VERSION_RELEASE 10" >>confdefs.h
+$as_echo "#define PACKAGE_VERSION_RELEASE 11" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -50116,48 +50117,44 @@ fi
if test "x$enable_ruby" != "xno"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby_init in -lruby" >&5
-$as_echo_n "checking for ruby_init in -lruby... " >&6; }
-if ${ac_cv_lib_ruby_ruby_init+:} false; then :
+ # Extract the first word of "ruby", so it can be a program name with args.
+set dummy ruby; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RUBY+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lruby $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ruby_init ();
-int
-main ()
-{
-return ruby_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ruby_ruby_init=yes
+ if test -n "$RUBY"; then
+ ac_cv_prog_RUBY="$RUBY" # Let the user override the test.
else
- ac_cv_lib_ruby_ruby_init=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RUBY="ruby"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_RUBY" && ac_cv_prog_RUBY="no"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ruby_ruby_init" >&5
-$as_echo "$ac_cv_lib_ruby_ruby_init" >&6; }
-if test "x$ac_cv_lib_ruby_ruby_init" = xyes; then :
- HAVE_LIBRUBY=1
+RUBY=$ac_cv_prog_RUBY
+if test -n "$RUBY"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
+$as_echo "$RUBY" >&6; }
else
- HAVE_LIBRUBY=0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
# Extract the first word of "rake", so it can be a program name with args.
set dummy rake; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -50196,6 +50193,49 @@ $as_echo "no" >&6; }
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby_init in -lruby" >&5
+$as_echo_n "checking for ruby_init in -lruby... " >&6; }
+if ${ac_cv_lib_ruby_ruby_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lruby $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ruby_init ();
+int
+main ()
+{
+return ruby_init ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ruby_ruby_init=yes
+else
+ ac_cv_lib_ruby_ruby_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ruby_ruby_init" >&5
+$as_echo "$ac_cv_lib_ruby_ruby_init" >&6; }
+if test "x$ac_cv_lib_ruby_ruby_init" = xyes; then :
+ HAVE_LIBRUBY=1
+else
+ HAVE_LIBRUBY=0
+fi
+
+
fi
if test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"; then
@@ -51875,7 +51915,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libguestfs $as_me 1.15.10, which was
+This file was extended by libguestfs $as_me 1.15.11, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -51945,7 +51985,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libguestfs config.status 1.15.10
+libguestfs config.status 1.15.11
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ea0aec4..28243a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [15])
-m4_define([libguestfs_release], [10])
+m4_define([libguestfs_release], [11])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
@@ -769,8 +769,10 @@ AC_ARG_ENABLE([ruby],
[enable_ruby=yes])
AS_IF([test "x$enable_ruby" != "xno"],
[
- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
+ AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
AC_CHECK_PROG([RAKE],[rake],[rake],[no])
+ AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
+ AC_SUBST([RAKE])
])
AM_CONDITIONAL([HAVE_RUBY],
[test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
diff --git a/csharp/Makefile.in b/csharp/Makefile.in
index 0563335..b753324 100644
--- a/csharp/Makefile.in
+++ b/csharp/Makefile.in
@@ -1101,6 +1101,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
index 3b4126a..d15fc8d 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
@@ -1199,6 +1199,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/daemon/utimens.c b/daemon/utimens.c
index ae006c6..2df6fc7 100644
--- a/daemon/utimens.c
+++ b/daemon/utimens.c
@@ -33,18 +33,8 @@ do_utimens (const char *path,
int64_t atsecs, int64_t atnsecs,
int64_t mtsecs, int64_t mtnsecs)
{
- int fd;
int r;
- CHROOT_IN;
- fd = open (path, O_WRONLY | O_NOCTTY);
- CHROOT_OUT;
-
- if (fd == -1) {
- reply_with_perror ("open: %s", path);
- return -1;
- }
-
if (atnsecs == -1)
atnsecs = UTIME_NOW;
if (atnsecs == -2)
@@ -60,15 +50,12 @@ do_utimens (const char *path,
times[1].tv_sec = mtsecs;
times[1].tv_nsec = mtnsecs;
- r = futimens (fd, times);
- if (r == -1) {
- reply_with_perror ("futimens: %s", path);
- close (fd);
- return -1;
- }
+ CHROOT_IN;
+ r = utimensat (-1, path, times, AT_SYMLINK_NOFOLLOW);
+ CHROOT_OUT;
- if (close (fd) == -1) {
- reply_with_perror ("close: %s", path);
+ if (r == -1) {
+ reply_with_perror ("utimensat: %s", path);
return -1;
}
diff --git a/debian/changelog b/debian/changelog
index 2b36b5b..4ebec48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libguestfs (1.15.10-1) unstable; urgency=low
+libguestfs (1.15.11-1) unstable; urgency=low
- * release: New upstream version 1.15.10.
+ * release: New upstream version 1.15.11.
-- Richard W.M. Jones <rjones at redhat.com> Thu, 9 Dec 2010 12:00:00 +0000
diff --git a/df/Makefile.in b/df/Makefile.in
index 66514a7..5295978 100644
--- a/df/Makefile.in
+++ b/df/Makefile.in
@@ -1172,6 +1172,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/edit/Makefile.in b/edit/Makefile.in
index 9fe322c..2ca79f7 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
@@ -1169,6 +1169,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/erlang/Makefile.in b/erlang/Makefile.in
index 940c4f8..f08091a 100644
--- a/erlang/Makefile.in
+++ b/erlang/Makefile.in
@@ -1165,6 +1165,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/erlang/examples/Makefile.in b/erlang/examples/Makefile.in
index 58f79fd..bebd4dd 100644
--- a/erlang/examples/Makefile.in
+++ b/erlang/examples/Makefile.in
@@ -1110,6 +1110,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 0b36437..5b609e5 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1166,6 +1166,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/extratests/Makefile.in b/extratests/Makefile.in
index ad331b3..3a4435b 100644
--- a/extratests/Makefile.in
+++ b/extratests/Makefile.in
@@ -1119,6 +1119,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/fish/Makefile.in b/fish/Makefile.in
index 35190c9..aa5a8b2 100644
--- a/fish/Makefile.in
+++ b/fish/Makefile.in
@@ -1204,6 +1204,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/fish/copy.c b/fish/copy.c
index 9416ce7..820e092 100644
--- a/fish/copy.c
+++ b/fish/copy.c
@@ -29,8 +29,13 @@
#include "fish.h"
-static int make_tar_from_local (const char *local);
-static int make_tar_output (const char *local, const char *basename);
+struct fd_pid {
+ int fd; /* -1 == error */
+ pid_t pid;
+};
+
+static struct fd_pid make_tar_from_local (const char *local);
+static struct fd_pid make_tar_output (const char *local, const char *basename);
static int split_path (char *buf, size_t buf_size, const char *path, const char **dirname, const char **basename);
int
@@ -67,24 +72,24 @@ run_copy_in (const char *cmd, size_t argc, char *argv[])
/* Upload each local one at a time using tar-in. */
int i;
for (i = 0; i < nr_locals; ++i) {
- int fd = make_tar_from_local (argv[i]);
- if (fd == -1) {
+ struct fd_pid fdpid = make_tar_from_local (argv[i]);
+ if (fdpid.fd == -1) {
free (remote);
return -1;
}
char fdbuf[64];
- snprintf (fdbuf, sizeof fdbuf, "/dev/fd/%d", fd);
+ snprintf (fdbuf, sizeof fdbuf, "/dev/fd/%d", fdpid.fd);
int r = guestfs_tar_in (g, fdbuf, remote);
- if (close (fd) == -1) {
+ if (close (fdpid.fd) == -1) {
perror ("close (tar-from-local subprocess)");
r = -1;
}
int status;
- if (wait (&status) == -1) {
+ if (waitpid (fdpid.pid, &status, 0) == -1) {
perror ("wait (tar-from-local subprocess)");
free (remote);
return -1;
@@ -110,25 +115,27 @@ static void tar_create (const char *dir, const char *path) __attribute__((noretu
/* This creates a subprocess which feeds a tar file back to the
* main guestfish process.
*/
-static int
+static struct fd_pid
make_tar_from_local (const char *local)
{
int fd[2];
+ struct fd_pid r = { .fd = -1 };
if (pipe (fd) == -1) {
perror ("pipe");
- return -1;
+ return r;
}
- pid_t pid = fork ();
- if (pid == -1) {
+ r.pid = fork ();
+ if (r.pid == -1) {
perror ("fork");
- return -1;
+ return r;
}
- if (pid > 0) { /* Parent */
+ if (r.pid > 0) { /* Parent */
close (fd[1]);
- return fd[0];
+ r.fd = fd[0];
+ return r;
}
/* Child. */
@@ -268,25 +275,25 @@ run_copy_out (const char *cmd, size_t argc, char *argv[])
return -1;
}
- int fd = make_tar_output (local, basename);
- if (fd == -1) {
+ struct fd_pid fdpid = make_tar_output (local, basename);
+ if (fdpid.fd == -1) {
free (remote);
return -1;
}
char fdbuf[64];
- snprintf (fdbuf, sizeof fdbuf, "/dev/fd/%d", fd);
+ snprintf (fdbuf, sizeof fdbuf, "/dev/fd/%d", fdpid.fd);
int r = guestfs_tar_out (g, remote, fdbuf);
- if (close (fd) == -1) {
+ if (close (fdpid.fd) == -1) {
perror ("close (tar-output subprocess)");
free (remote);
r = -1;
}
int status;
- if (wait (&status) == -1) {
+ if (waitpid (fdpid.pid, &status, 0) == -1) {
perror ("wait (tar-output subprocess)");
free (remote);
return -1;
@@ -312,25 +319,27 @@ run_copy_out (const char *cmd, size_t argc, char *argv[])
* guestfish process and unpacks it into the 'local/basename'
* directory.
*/
-static int
+static struct fd_pid
make_tar_output (const char *local, const char *basename)
{
int fd[2];
+ struct fd_pid r = { .fd = -1 };
if (pipe (fd) == -1) {
perror ("pipe");
- return -1;
+ return r;
}
- pid_t pid = fork ();
- if (pid == -1) {
+ r.pid = fork ();
+ if (r.pid == -1) {
perror ("fork");
- return -1;
+ return r;
}
- if (pid > 0) { /* Parent */
+ if (r.pid > 0) { /* Parent */
close (fd[0]);
- return fd[1];
+ r.fd = fd[1];
+ return r;
}
/* Child. */
diff --git a/fish/inspect.c b/fish/inspect.c
index 98329ee..f93367b 100644
--- a/fish/inspect.c
+++ b/fish/inspect.c
@@ -86,14 +86,42 @@ inspect_mount (void)
exit (EXIT_FAILURE);
if (roots[0] == NULL) {
- fprintf (stderr, _("%s: no operating system was found on this disk\n"),
+ fprintf (stderr,
+ _("%s: no operating system was found on this disk\n"
+ "\n"
+ "If using guestfish '-i' option, remove this option and instead\n"
+ "use the commands 'run' followed by 'list-filesystems'.\n"
+ "You can then mount filesystems you want by hand using the\n"
+ "'mount' or 'mount-ro' command.\n"
+ "\n"
+ "If using guestmount '-i', remove this option and choose the\n"
+ "filesystem(s) you want to see by manually adding '-m' option(s).\n"
+ "Use 'virt-filesystems' to see what filesystems are available.\n"
+ "\n"
+ "If using other virt tools, this disk image won't work\n"
+ "with these tools. Use the guestfish equivalent commands\n"
+ "(see the virt tool manual page).\n"),
program_name);
free_strings (roots);
exit (EXIT_FAILURE);
}
if (roots[1] != NULL) {
- fprintf (stderr, _("%s: multi-boot operating systems are not supported by the -i option\n"),
+ fprintf (stderr,
+ _("%s: multi-boot operating systems are not supported\n"
+ "\n"
+ "If using guestfish '-i' option, remove this option and instead\n"
+ "use the commands 'run' followed by 'list-filesystems'.\n"
+ "You can then mount filesystems you want by hand using the\n"
+ "'mount' or 'mount-ro' command.\n"
+ "\n"
+ "If using guestmount '-i', remove this option and choose the\n"
+ "filesystem(s) you want to see by manually adding '-m' option(s).\n"
+ "Use 'virt-filesystems' to see what filesystems are available.\n"
+ "\n"
+ "If using other virt tools, multi-boot operating systems won't work\n"
+ "with these tools. Use the guestfish equivalent commands\n"
+ "(see the virt tool manual page).\n"),
program_name);
free_strings (roots);
exit (EXIT_FAILURE);
@@ -126,8 +154,14 @@ inspect_mount_root (const char *root)
r = guestfs_mount_options (g, "", mountpoints[i+1], mountpoints[i]);
else
r = guestfs_mount_ro (g, mountpoints[i+1], mountpoints[i]);
- if (r == -1)
+ if (r == -1) {
+ /* If the "/" filesystem could not be mounted, give up, else
+ * just count the errors and print a warning.
+ */
+ if (STREQ (mountpoints[i], "/"))
+ exit (EXIT_FAILURE);
mount_errors++;
+ }
}
free_strings (mountpoints);
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
index 7398d3e..3653843 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
@@ -1178,6 +1178,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index 54ed947..7782be1 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -1227,5 +1227,5 @@ main (int argc, char *argv[])
guestfs_close (g);
free_dir_caches ();
- exit (r == -1 ? 1 : 0);
+ exit (r == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
diff --git a/generator/Makefile.in b/generator/Makefile.in
index ca1c240..ec091af 100644
--- a/generator/Makefile.in
+++ b/generator/Makefile.in
@@ -1085,6 +1085,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml
index 55e8d5d..dae837b 100644
--- a/generator/generator_actions.ml
+++ b/generator/generator_actions.ml
@@ -4819,10 +4819,31 @@ for the file until you write to it). To create a non-sparse
file of zeroes, use C<guestfs_fallocate64> instead.");
("utimens", (RErr, [Pathname "path"; Int64 "atsecs"; Int64 "atnsecs"; Int64 "mtsecs"; Int64 "mtnsecs"], []), 201, [],
+ (* Test directories, named pipes etc (RHBZ#761451, RHBZ#761460) *)
[InitScratchFS, Always, TestOutputStruct (
- [["touch"; "/utimens"];
- ["utimens"; "/utimens"; "12345"; "67890"; "9876"; "5432"];
- ["stat"; "/utimens"]], [CompareWithInt ("mtime", 9876)])],
+ [["touch"; "/utimens-file"];
+ ["utimens"; "/utimens-file"; "12345"; "67890"; "9876"; "5432"];
+ ["stat"; "/utimens-file"]], [CompareWithInt ("mtime", 9876)]);
+ InitScratchFS, Always, TestOutputStruct (
+ [["mkdir"; "/utimens-dir"];
+ ["utimens"; "/utimens-dir"; "12345"; "67890"; "9876"; "5432"];
+ ["stat"; "/utimens-dir"]], [CompareWithInt ("mtime", 9876)]);
+ InitScratchFS, Always, TestOutputStruct (
+ [["mkfifo"; "0o644"; "/utimens-fifo"];
+ ["utimens"; "/utimens-fifo"; "12345"; "67890"; "9876"; "5432"];
+ ["stat"; "/utimens-fifo"]], [CompareWithInt ("mtime", 9876)]);
+ InitScratchFS, Always, TestOutputStruct (
+ [["ln_sf"; "/utimens-file"; "/utimens-link"];
+ ["utimens"; "/utimens-link"; "12345"; "67890"; "9876"; "5432"];
+ ["stat"; "/utimens-link"]], [CompareWithInt ("mtime", 9876)]);
+ InitScratchFS, Always, TestOutputStruct (
+ [["mknod_b"; "0o644"; "8"; "0"; "/utimens-block"];
+ ["utimens"; "/utimens-block"; "12345"; "67890"; "9876"; "5432"];
+ ["stat"; "/utimens-block"]], [CompareWithInt ("mtime", 9876)]);
+ InitScratchFS, Always, TestOutputStruct (
+ [["mknod_c"; "0o644"; "1"; "3"; "/utimens-char"];
+ ["utimens"; "/utimens-char"; "12345"; "67890"; "9876"; "5432"];
+ ["stat"; "/utimens-char"]], [CompareWithInt ("mtime", 9876)])],
"set timestamp of a file with nanosecond precision",
"\
This command sets the timestamps of a file with nanosecond
diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
index 549eabc..91824b5 100644
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -1177,6 +1177,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in
index 6ff9284..f2c12a9 100644
--- a/gnulib/tests/Makefile.in
+++ b/gnulib/tests/Makefile.in
@@ -2064,6 +2064,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/haskell/Makefile.in b/haskell/Makefile.in
index b184ae6..5dc076e 100644
--- a/haskell/Makefile.in
+++ b/haskell/Makefile.in
@@ -1103,6 +1103,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/images/Makefile.in b/images/Makefile.in
index eb635d8..1c5168d 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
@@ -1103,6 +1103,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/inspector/Makefile.in b/inspector/Makefile.in
index 5d4521b..5854286 100644
--- a/inspector/Makefile.in
+++ b/inspector/Makefile.in
@@ -1180,6 +1180,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/java/Makefile.in b/java/Makefile.in
index fdc84af..0437ee7 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -1190,6 +1190,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/java/examples/Makefile.in b/java/examples/Makefile.in
index f7e2b84..6af6780 100644
--- a/java/examples/Makefile.in
+++ b/java/examples/Makefile.in
@@ -1112,6 +1112,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/libguestfs.pc b/libguestfs.pc
index 99b6898..e9f0944 100644
--- a/libguestfs.pc
+++ b/libguestfs.pc
@@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: libguestfs
-Version: 1.15.10
+Version: 1.15.11
Description: libguestfs library for accessing and modifying VM images
Requires:
Cflags:
diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
index 6e4246d..b0aef84 100644
--- a/ocaml/Makefile.in
+++ b/ocaml/Makefile.in
@@ -1108,6 +1108,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/ocaml/examples/Makefile.in b/ocaml/examples/Makefile.in
index 63c9a21..c5e8aca 100644
--- a/ocaml/examples/Makefile.in
+++ b/ocaml/examples/Makefile.in
@@ -1112,6 +1112,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/perl/Makefile.in b/perl/Makefile.in
index 1d78b62..95a8f68 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -1103,6 +1103,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/perl/examples/Makefile.in b/perl/examples/Makefile.in
index 552cbcd..35c1e86 100644
--- a/perl/examples/Makefile.in
+++ b/perl/examples/Makefile.in
@@ -1110,6 +1110,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/php/Makefile.in b/php/Makefile.in
index 00a28c8..baaf50c 100644
--- a/php/Makefile.in
+++ b/php/Makefile.in
@@ -1127,6 +1127,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/po-docs/Makefile.in b/po-docs/Makefile.in
index 14b33ff..b4035d7 100644
--- a/po-docs/Makefile.in
+++ b/po-docs/Makefile.in
@@ -1127,6 +1127,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/po-docs/ja/Makefile.in b/po-docs/ja/Makefile.in
index 490ff30..fdd0fbc 100644
--- a/po-docs/ja/Makefile.in
+++ b/po-docs/ja/Makefile.in
@@ -1087,6 +1087,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/po-docs/ja/guestfish.1 b/po-docs/ja/guestfish.1
index 1d38a8c..9f82a66 100644
--- a/po-docs/ja/guestfish.1
+++ b/po-docs/ja/guestfish.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfish 1"
-.TH guestfish 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH guestfish 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/guestfs.3 b/po-docs/ja/guestfs.3
index a6901c7..b4ea6d3 100644
--- a/po-docs/ja/guestfs.3
+++ b/po-docs/ja/guestfs.3
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfs 3"
-.TH guestfs 3 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH guestfs 3 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/guestmount.1 b/po-docs/ja/guestmount.1
index 0314bd7..694c23a 100644
--- a/po-docs/ja/guestmount.1
+++ b/po-docs/ja/guestmount.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestmount 1"
-.TH guestmount 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH guestmount 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/libguestfs-test-tool.1 b/po-docs/ja/libguestfs-test-tool.1
index ea62be8..6a33c0a 100644
--- a/po-docs/ja/libguestfs-test-tool.1
+++ b/po-docs/ja/libguestfs-test-tool.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "libguestfs-test-tool 1"
-.TH libguestfs-test-tool 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH libguestfs-test-tool 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-alignment-scan.1 b/po-docs/ja/virt-alignment-scan.1
index adee56d..e1bcf7e 100644
--- a/po-docs/ja/virt-alignment-scan.1
+++ b/po-docs/ja/virt-alignment-scan.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-alignment-scan 1"
-.TH virt-alignment-scan 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-alignment-scan 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-cat.1 b/po-docs/ja/virt-cat.1
index c6bc257..2be8690 100644
--- a/po-docs/ja/virt-cat.1
+++ b/po-docs/ja/virt-cat.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-cat 1"
-.TH virt-cat 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-cat 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-copy-in.1 b/po-docs/ja/virt-copy-in.1
index 507da34..5c2ea3b 100644
--- a/po-docs/ja/virt-copy-in.1
+++ b/po-docs/ja/virt-copy-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-in 1"
-.TH virt-copy-in 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-copy-in 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-copy-out.1 b/po-docs/ja/virt-copy-out.1
index 1b7b717..e673a63 100644
--- a/po-docs/ja/virt-copy-out.1
+++ b/po-docs/ja/virt-copy-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-out 1"
-.TH virt-copy-out 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-copy-out 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-df.1 b/po-docs/ja/virt-df.1
index be4842d..4292586 100644
--- a/po-docs/ja/virt-df.1
+++ b/po-docs/ja/virt-df.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-df 1"
-.TH virt-df 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-df 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-edit.1 b/po-docs/ja/virt-edit.1
index 09050d2..fc1c2c9 100644
--- a/po-docs/ja/virt-edit.1
+++ b/po-docs/ja/virt-edit.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-edit 1"
-.TH virt-edit 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-edit 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-filesystems.1 b/po-docs/ja/virt-filesystems.1
index 352bcf3..5760b1b 100644
--- a/po-docs/ja/virt-filesystems.1
+++ b/po-docs/ja/virt-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-filesystems 1"
-.TH virt-filesystems 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-filesystems 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-inspector.1 b/po-docs/ja/virt-inspector.1
index c2b1980..f1c3826 100644
--- a/po-docs/ja/virt-inspector.1
+++ b/po-docs/ja/virt-inspector.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-inspector 1"
-.TH virt-inspector 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-inspector 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-list-filesystems.1 b/po-docs/ja/virt-list-filesystems.1
index 5cc142c..6d0ff20 100644
--- a/po-docs/ja/virt-list-filesystems.1
+++ b/po-docs/ja/virt-list-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-filesystems.pl 1"
-.TH virt-list-filesystems.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-list-filesystems.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-list-partitions.1 b/po-docs/ja/virt-list-partitions.1
index 2167beb..849a3dc 100644
--- a/po-docs/ja/virt-list-partitions.1
+++ b/po-docs/ja/virt-list-partitions.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-partitions.pl 1"
-.TH virt-list-partitions.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-list-partitions.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-ls.1 b/po-docs/ja/virt-ls.1
index 6a1c683..e54b446 100644
--- a/po-docs/ja/virt-ls.1
+++ b/po-docs/ja/virt-ls.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-ls 1"
-.TH virt-ls 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-ls 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-make-fs.1 b/po-docs/ja/virt-make-fs.1
index 13ec707..7b8296d 100644
--- a/po-docs/ja/virt-make-fs.1
+++ b/po-docs/ja/virt-make-fs.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-make-fs.pl 1"
-.TH virt-make-fs.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-make-fs.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-rescue.1 b/po-docs/ja/virt-rescue.1
index 58ae8c6..5d0d8c5 100644
--- a/po-docs/ja/virt-rescue.1
+++ b/po-docs/ja/virt-rescue.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-rescue 1"
-.TH virt-rescue 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-rescue 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-resize.1 b/po-docs/ja/virt-resize.1
index aa4db88..34e9f9e 100644
--- a/po-docs/ja/virt-resize.1
+++ b/po-docs/ja/virt-resize.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-resize 1"
-.TH virt-resize 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-resize 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-sparsify.1 b/po-docs/ja/virt-sparsify.1
index 88629e9..480210e 100644
--- a/po-docs/ja/virt-sparsify.1
+++ b/po-docs/ja/virt-sparsify.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sparsify 1"
-.TH virt-sparsify 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-sparsify 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-sysprep.1 b/po-docs/ja/virt-sysprep.1
index 45cf970..dba9127 100644
--- a/po-docs/ja/virt-sysprep.1
+++ b/po-docs/ja/virt-sysprep.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sysprep 1"
-.TH virt-sysprep 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-sysprep 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-tar-in.1 b/po-docs/ja/virt-tar-in.1
index fe7f3b6..616c65f 100644
--- a/po-docs/ja/virt-tar-in.1
+++ b/po-docs/ja/virt-tar-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-in 1"
-.TH virt-tar-in 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-tar-in 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-tar-out.1 b/po-docs/ja/virt-tar-out.1
index f1693b1..c1ea37b 100644
--- a/po-docs/ja/virt-tar-out.1
+++ b/po-docs/ja/virt-tar-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-out 1"
-.TH virt-tar-out 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-tar-out 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-tar.1 b/po-docs/ja/virt-tar.1
index efe4b87..6b00546 100644
--- a/po-docs/ja/virt-tar.1
+++ b/po-docs/ja/virt-tar.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar.pl 1"
-.TH virt-tar.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-tar.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-win-reg.1 b/po-docs/ja/virt-win-reg.1
index d55048f..695c544 100644
--- a/po-docs/ja/virt-win-reg.1
+++ b/po-docs/ja/virt-win-reg.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-win-reg.pl 1"
-.TH virt-win-reg.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-win-reg.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 43c39ee..4b06ec0 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.15.10\n"
+"Project-Id-Version: libguestfs 1.15.11\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2011-12-06 15:09+0000\n"
+"POT-Creation-Date: 2011-12-09 17:33+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po-docs/uk/Makefile.in b/po-docs/uk/Makefile.in
index 3d9e44c..b83d69f 100644
--- a/po-docs/uk/Makefile.in
+++ b/po-docs/uk/Makefile.in
@@ -1087,6 +1087,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/po-docs/uk/guestfish.1 b/po-docs/uk/guestfish.1
index f800901..61a68ba 100644
--- a/po-docs/uk/guestfish.1
+++ b/po-docs/uk/guestfish.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfish 1"
-.TH guestfish 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH guestfish 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/guestfs.3 b/po-docs/uk/guestfs.3
index 94e99f1..8d8740e 100644
--- a/po-docs/uk/guestfs.3
+++ b/po-docs/uk/guestfs.3
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfs 3"
-.TH guestfs 3 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH guestfs 3 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/guestmount.1 b/po-docs/uk/guestmount.1
index 26215e0..45173dc 100644
--- a/po-docs/uk/guestmount.1
+++ b/po-docs/uk/guestmount.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestmount 1"
-.TH guestmount 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH guestmount 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/libguestfs-test-tool.1 b/po-docs/uk/libguestfs-test-tool.1
index 5d247dd..0150d61 100644
--- a/po-docs/uk/libguestfs-test-tool.1
+++ b/po-docs/uk/libguestfs-test-tool.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "libguestfs-test-tool 1"
-.TH libguestfs-test-tool 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH libguestfs-test-tool 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-alignment-scan.1 b/po-docs/uk/virt-alignment-scan.1
index 23464a9..7c2aef3 100644
--- a/po-docs/uk/virt-alignment-scan.1
+++ b/po-docs/uk/virt-alignment-scan.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-alignment-scan 1"
-.TH virt-alignment-scan 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-alignment-scan 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-cat.1 b/po-docs/uk/virt-cat.1
index 48dd6fd..1fadfa6 100644
--- a/po-docs/uk/virt-cat.1
+++ b/po-docs/uk/virt-cat.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-cat 1"
-.TH virt-cat 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-cat 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-copy-in.1 b/po-docs/uk/virt-copy-in.1
index 90b5ea6..811de68 100644
--- a/po-docs/uk/virt-copy-in.1
+++ b/po-docs/uk/virt-copy-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-in 1"
-.TH virt-copy-in 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-copy-in 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-copy-out.1 b/po-docs/uk/virt-copy-out.1
index 57001d5..6a0f351 100644
--- a/po-docs/uk/virt-copy-out.1
+++ b/po-docs/uk/virt-copy-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-out 1"
-.TH virt-copy-out 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-copy-out 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-df.1 b/po-docs/uk/virt-df.1
index bc10d18..602d53b 100644
--- a/po-docs/uk/virt-df.1
+++ b/po-docs/uk/virt-df.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-df 1"
-.TH virt-df 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-df 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-edit.1 b/po-docs/uk/virt-edit.1
index 1fe5946..bee3535 100644
--- a/po-docs/uk/virt-edit.1
+++ b/po-docs/uk/virt-edit.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-edit 1"
-.TH virt-edit 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-edit 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-filesystems.1 b/po-docs/uk/virt-filesystems.1
index 5b2f65b..0a6cd8d 100644
--- a/po-docs/uk/virt-filesystems.1
+++ b/po-docs/uk/virt-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-filesystems 1"
-.TH virt-filesystems 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-filesystems 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-inspector.1 b/po-docs/uk/virt-inspector.1
index a3581f4..d76e1cb 100644
--- a/po-docs/uk/virt-inspector.1
+++ b/po-docs/uk/virt-inspector.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-inspector 1"
-.TH virt-inspector 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-inspector 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-list-filesystems.1 b/po-docs/uk/virt-list-filesystems.1
index b726e48..d2cd08b 100644
--- a/po-docs/uk/virt-list-filesystems.1
+++ b/po-docs/uk/virt-list-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-filesystems.pl 1"
-.TH virt-list-filesystems.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-list-filesystems.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-list-partitions.1 b/po-docs/uk/virt-list-partitions.1
index 503fecf..7f931a8 100644
--- a/po-docs/uk/virt-list-partitions.1
+++ b/po-docs/uk/virt-list-partitions.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-partitions.pl 1"
-.TH virt-list-partitions.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-list-partitions.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-ls.1 b/po-docs/uk/virt-ls.1
index c2ca2a0..abdede2 100644
--- a/po-docs/uk/virt-ls.1
+++ b/po-docs/uk/virt-ls.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-ls 1"
-.TH virt-ls 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-ls 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-make-fs.1 b/po-docs/uk/virt-make-fs.1
index 6dd272e..019935e 100644
--- a/po-docs/uk/virt-make-fs.1
+++ b/po-docs/uk/virt-make-fs.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-make-fs.pl 1"
-.TH virt-make-fs.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-make-fs.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-rescue.1 b/po-docs/uk/virt-rescue.1
index 0bd3764..16ab2d4 100644
--- a/po-docs/uk/virt-rescue.1
+++ b/po-docs/uk/virt-rescue.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-rescue 1"
-.TH virt-rescue 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-rescue 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-resize.1 b/po-docs/uk/virt-resize.1
index dd2babf..2cd7ba1 100644
--- a/po-docs/uk/virt-resize.1
+++ b/po-docs/uk/virt-resize.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-resize 1"
-.TH virt-resize 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-resize 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-sparsify.1 b/po-docs/uk/virt-sparsify.1
index 143b6c9..5178cad 100644
--- a/po-docs/uk/virt-sparsify.1
+++ b/po-docs/uk/virt-sparsify.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sparsify 1"
-.TH virt-sparsify 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-sparsify 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-sysprep.1 b/po-docs/uk/virt-sysprep.1
index 2a69c70..a177af8 100644
--- a/po-docs/uk/virt-sysprep.1
+++ b/po-docs/uk/virt-sysprep.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sysprep 1"
-.TH virt-sysprep 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-sysprep 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-tar-in.1 b/po-docs/uk/virt-tar-in.1
index 2711de3..5840cd2 100644
--- a/po-docs/uk/virt-tar-in.1
+++ b/po-docs/uk/virt-tar-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-in 1"
-.TH virt-tar-in 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-tar-in 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-tar-out.1 b/po-docs/uk/virt-tar-out.1
index a45a53d..e9cc78f 100644
--- a/po-docs/uk/virt-tar-out.1
+++ b/po-docs/uk/virt-tar-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-out 1"
-.TH virt-tar-out 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-tar-out 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-tar.1 b/po-docs/uk/virt-tar.1
index cba055c..fccdc25 100644
--- a/po-docs/uk/virt-tar.1
+++ b/po-docs/uk/virt-tar.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar.pl 1"
-.TH virt-tar.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-tar.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-win-reg.1 b/po-docs/uk/virt-win-reg.1
index a4c6c5b..527a903 100644
--- a/po-docs/uk/virt-win-reg.1
+++ b/po-docs/uk/virt-win-reg.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-win-reg.pl 1"
-.TH virt-win-reg.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
+.TH virt-win-reg.pl 1 "2011-12-09" "libguestfs-1.15.11" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 0f1410f..0d9d457 100644
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index 933612e..ee8db09 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
@@ -2160,35 +2160,35 @@ msgstr ""
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2460,27 +2460,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr ""
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
diff --git a/po/es.gmo b/po/es.gmo
index db5b932..c766555 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 7615d26..57aa9ed 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (Castilian) <trans-es at lists.fedoraproject.org>\n"
@@ -2266,7 +2266,7 @@ msgstr "%s: comando desconocido\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr "%s: %s: linea %d: error al analizar el archivo de configuración: %s\n"
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2274,19 +2274,19 @@ msgstr ""
"utilice el comando 'copy-in <local> [<local>...] <remotedir>' para copiar "
"archivos dentro de la imagen\n"
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr "copy-in: el destino '%s' no es un directorio\n"
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
"error: la longitud del argumento es cero, o es mayor que la máxima "
"permitida\n"
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2295,12 +2295,12 @@ msgstr ""
"utilice el comando 'copy-out <remote> [<remote>...] <localdir>' para copiar "
"archivos fuera de la imagen\n"
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr "copy-out: el destino '%s' no es un directorio\n"
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr "copy-out: '%s' no es ni un archivo ni un directorio\n"
@@ -2664,31 +2664,57 @@ msgstr "hexedit: rango inválido\n"
msgid "%s: don't use --live and -i options together\n"
msgstr "%s: no utilice al mismo tiempo las opciones --live e -i\n"
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: no se ha encontrado un sistema operativo en este disco\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-"%s: los sistemas operativos de tipo multi arranque no tienen soporte con la "
-"opción -i\n"
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
"%s: algunos sistemas de archivos no han podido ser montados (se han "
"ignorado)\n"
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr "Sistema operativo: %s\n"
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr "%s montado en %s\n"
@@ -4044,3 +4070,12 @@ msgstr ""
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
"virt-win-reg: {p}: no ha sido posible cargar el archivo de registro: {err}\n"
+
+#~ msgid "%s: no operating system was found on this disk\n"
+#~ msgstr "%s: no se ha encontrado un sistema operativo en este disco\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr ""
+#~ "%s: los sistemas operativos de tipo multi arranque no tienen soporte con "
+#~ "la opción -i\n"
diff --git a/po/gu.gmo b/po/gu.gmo
index 9b2a0c4..6427251 100644
Binary files a/po/gu.gmo and b/po/gu.gmo differ
diff --git a/po/gu.po b/po/gu.po
index 6cf99ca..0fe2a0b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati <trans-gu at lists.fedoraproject.org>\n"
@@ -2092,35 +2092,35 @@ msgstr "%s: અજ્ઞાત આદેશ\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2397,27 +2397,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: ઓપરેટીંગ સિસ્ટમ આ ડિસ્ક પર મળી ન હતી\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr "%s: અમુક ફાઇલસિસ્ટમોને માઉન્ટ કરી શક્યા નહિં (અવગણેલ)\n"
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr "ઓપરેટીંગ સિસ્ટમ: %s\n"
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
@@ -3571,3 +3599,6 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "%s: no operating system was found on this disk\n"
+#~ msgstr "%s: ઓપરેટીંગ સિસ્ટમ આ ડિસ્ક પર મળી ન હતી\n"
diff --git a/po/hi.gmo b/po/hi.gmo
index 44f1132..bf59437 100644
Binary files a/po/hi.gmo and b/po/hi.gmo differ
diff --git a/po/hi.po b/po/hi.po
index 8898f23..2043d1c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi <indlinux-hindi at lists.sourceforge.net>\n"
@@ -2091,35 +2091,35 @@ msgstr "%s: अज्ञात कमांड\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2397,27 +2397,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr ""
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
diff --git a/po/kn.gmo b/po/kn.gmo
index 906e198..88b7096 100644
Binary files a/po/kn.gmo and b/po/kn.gmo differ
diff --git a/po/kn.po b/po/kn.po
index 1505bcf..2a1977f 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.net/projects/p/fedora/team/"
@@ -2095,35 +2095,35 @@ msgstr ""
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2400,27 +2400,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr ""
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index b7bb092..5698188 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.15.10\n"
+"Project-Id-Version: libguestfs 1.15.11\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2087,35 +2087,35 @@ msgstr ""
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2387,27 +2387,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr ""
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
diff --git a/po/ml.gmo b/po/ml.gmo
index ea1bfc9..12ccfca 100644
Binary files a/po/ml.gmo and b/po/ml.gmo differ
diff --git a/po/ml.po b/po/ml.po
index 52ab697..1f00b8c 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam <discuss at lists.smc.org.in>\n"
@@ -2093,35 +2093,35 @@ msgstr "%s: അപരിചിതമായ കമാന്ഡ്\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2398,27 +2398,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr ""
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
diff --git a/po/mr.gmo b/po/mr.gmo
index c7a5ae7..ef44cdd 100644
Binary files a/po/mr.gmo and b/po/mr.gmo differ
diff --git a/po/mr.po b/po/mr.po
index c935e4e..fa91edf 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.net/projects/p/fedora/team/"
@@ -2165,7 +2165,7 @@ msgstr "%s: अपरिचीत आदेश\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2173,17 +2173,17 @@ msgstr ""
"प्रतिमामध्ये फाइल्स्चे प्रत बनवण्यासाठी 'copy-in <local> [<local>...] <remotedir>' "
"याचा वापर करा\n"
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr "copy-in: लक्ष्य '%s' डिरेक्ट्री नाही\n"
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr "त्रुटी: घटक झिरो लेंग्थ् किंवा स्वीकार्य कमालपेक्षा जास्त आहे\n"
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2192,12 +2192,12 @@ msgstr ""
"प्रतिमेच्या बाहेर फाइल्चे प्रत निर्माण करण्यासाठी 'copy-out <remote> [<remote>...] "
"<localdir>' वापर करा\n"
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr "copy-out: लक्ष्य '%s' डिरेक्ट्री नाही\n"
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr "copy-out: '%s' फाइल किंवा डिरेक्ट्री नाही\n"
@@ -2499,27 +2499,55 @@ msgstr "hexedit: अवैध व्याप्ती\n"
msgid "%s: don't use --live and -i options together\n"
msgstr "%s: --live व -i पर्यायचा एकत्र वाप करू नका\n"
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: या डिस्कवर कार्यप्रणाली आढळली नाही\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
-msgstr "%s: मल्टि-बूट कार्य प्रणाल्या -i पर्यायद्वारे समर्थीत नाही\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr "%s: काहिक फाइलप्रणाली माऊंट करणे अशक्य (दुर्लक्ष केले)\n"
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr "कार्यप्रणाली: %s\n"
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr "%s ला %s वर माऊंट केले\n"
@@ -3762,3 +3790,10 @@ msgstr "virt-win-reg: {p}: रेजिस्ट्री फाइल डाउ
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: रेजिस्ट्री फाइल अपलोड करणे शक्य नाही: {err}\n"
+
+#~ msgid "%s: no operating system was found on this disk\n"
+#~ msgstr "%s: या डिस्कवर कार्यप्रणाली आढळली नाही\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr "%s: मल्टि-बूट कार्य प्रणाल्या -i पर्यायद्वारे समर्थीत नाही\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index 558ede7..b571855 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 80d063d..c09d962 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.net/projects/p/fedora/team/nl/)\n"
@@ -2248,7 +2248,7 @@ msgstr "%s: onbekend commando\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr "%s: %s:regel %d: fout bij ontleden van configuratie bestand: %s\n"
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2256,17 +2256,17 @@ msgstr ""
"gebruik 'copy-in <local> [<local>...] <remotedir>' om bestanden naar de "
"image te kopieren\n"
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr "copy-in: doel '%s' is geen map\n"
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr "fout: argument heeft lengte nul of is langer dan toegestaan\n"
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2275,12 +2275,12 @@ msgstr ""
"gebruik 'copy-out <remote> [<remote>...] <localdir>' om bestanden uit de "
"image te kopieren\n"
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr "copy-out: doel '%s' is geen map\n"
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr "copy-out: '%s' is geen bestand of map\n"
@@ -2641,29 +2641,56 @@ msgstr "hexedit: ongeldige reeks\n"
msgid "%s: don't use --live and -i options together\n"
msgstr "%s: gebruik --live en -i opties niet tezamen\n"
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: op deze schijf werd geen besturingssysteem gevonden\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-"%s: multi-boot besturingssystemen vorden niet ondersteund door de -i optie\n"
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
"%s: sommige bestandssystemen konden niet aangekoppeld worden (genegeerd)\n"
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr "Besturingssysteem: %s\n"
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr "%s aangekoppeld op %s\n"
@@ -3989,3 +4016,12 @@ msgstr "virt-win-reg: {p}: kon registry bestand niet downloaden: {err}\n"
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: kon registry bestand niet uploaden: {err}\n"
+
+#~ msgid "%s: no operating system was found on this disk\n"
+#~ msgstr "%s: op deze schijf werd geen besturingssysteem gevonden\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr ""
+#~ "%s: multi-boot besturingssystemen vorden niet ondersteund door de -i "
+#~ "optie\n"
diff --git a/po/or.gmo b/po/or.gmo
index 5d9e14c..c1a3f06 100644
Binary files a/po/or.gmo and b/po/or.gmo differ
diff --git a/po/or.po b/po/or.po
index 99707ab..82935e6 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.net/projects/p/fedora/team/or/)\n"
@@ -2091,35 +2091,35 @@ msgstr "%s: ଅଜଣା ନିର୍ଦ୍ଦେଶ\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2397,27 +2397,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr ""
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
diff --git a/po/pa.gmo b/po/pa.gmo
index 9578ec5..cfe44cf 100644
Binary files a/po/pa.gmo and b/po/pa.gmo differ
diff --git a/po/pa.po b/po/pa.po
index cb3c573..f7bafe1 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) <punjabi-users at lists.sf.net>\n"
@@ -2163,24 +2163,24 @@ msgstr "%s: ਅਣਜਾਣ ਕਮਾਂਡ\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
"ਫਾਇਲਾਂ ਨੂੰ ਈਮੇਜ਼ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ 'copy-in <local> [<local>...] <remotedir>' ਵਰਤੋ\n"
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr "copy-in: ਟਾਰਗਿਟ '%s' ਇੱਕ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ\n"
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr "ਗਲਤੀ: ਆਰਗੂਮੈਂਟ ਦੀ ਜ਼ੀਰੋ ਲੰਬਾਈ ਹੈ ਜਾਂ ਅਧਿਕਤਮ ਮਨਜੂਰ ਤੋਂ ਜਿਆਦਾ ਹੈ\n"
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2188,12 +2188,12 @@ msgid ""
msgstr ""
"ਈਮੇਜ਼ ਵਿੱਚ ਫਾਇਲਾਂ ਕਾਪੀ ਕਰਨ ਲਈ 'copy-out <remote> [<remote>...] <localdir>' ਵਰਤੋ\n"
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr "ਕਾਪੀ-ਆਊਟ: ਟਾਰਗਿਟ '%s' ਇੱਕ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ\n"
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr "copy-out: '%s' ਇੱਕ ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ\n"
@@ -2494,27 +2494,55 @@ msgstr "hexedit: ਯੋਗ ਰੇਂਜ\n"
msgid "%s: don't use --live and -i options together\n"
msgstr "%s: --live ਅਤੇ -i ਚੋਣਾਂ ਇਕੱਠੀਆਂ ਨਾ ਵਰਤੋ\n"
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: ਕੋਈ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਇਸ ਡਿਸਕ ਤੇ ਨਹੀਂ ਲੱਭਿਆ\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
-msgstr "%s: ਮਲਟੀ-ਬੂਟ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ -i ਚੋਣ ਦੁਆਰਾ ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr "%s: ਕੁਝ ਫਾਇਲ ਸਿਸਟਮ ਮਾਊਂਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ (ਰੱਦ ਕੀਤੇ ਗਏ ਹਨ)\n"
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr "ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ: %s\n"
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr "%s ਨੂੰ %s ਉੱਪਰ ਮਾਊਂਟ ਕੀਤਾ ਗਿਆ ਹੈ\n"
@@ -3760,3 +3788,10 @@ msgstr "virt-win-reg: {p}: ਰਜਿਸਟਰੀ ਫਾਇਲ ਡਾਊਂਲੋ
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: ਰਜਿਸਟਰੀ ਫਾਇਲ ਨੂੰ ਅੱਪਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ: {err}\n"
+
+#~ msgid "%s: no operating system was found on this disk\n"
+#~ msgstr "%s: ਕੋਈ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਇਸ ਡਿਸਕ ਤੇ ਨਹੀਂ ਲੱਭਿਆ\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr "%s: ਮਲਟੀ-ਬੂਟ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ -i ਚੋਣ ਦੁਆਰਾ ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index f885de7..b8ea161 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index a105336..f02632e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/fedora/team/pl/)\n"
@@ -2259,7 +2259,7 @@ msgstr "%s: nieznane polecenie\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr "%s: %s: wiersz %d: błąd podczas przetwarzania pliku konfiguracji: %s\n"
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2267,18 +2267,18 @@ msgstr ""
"należy użyć \"copy-in <lokalny> [<lokalny>...] <zdalny_katalog>\", aby "
"skopiować pliki do obrazu\n"
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr "copy-in: cel \"%s\" nie jest katalogiem\n"
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
"błąd: parametr jest zerowej długości lub dłuższy niż dozwolone maksimum\n"
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2287,12 +2287,12 @@ msgstr ""
"należy użyć \"copy-out <zdalny> [<zdalny>...] <lokalny_katalog>\", aby "
"skopiować pliki z obrazu\n"
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr "copy-out: element docelowy \"%s\" nie jest katalogiem\n"
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr "copy-out: \"%s\" nie jest plikiem lub katalogiem\n"
@@ -2654,28 +2654,55 @@ msgstr "hexedit: nieprawidłowy zakres\n"
msgid "%s: don't use --live and -i options together\n"
msgstr "%s: nie należy używać razem opcji --live i -i\n"
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: na tym dysku nie odnaleziono żadnych systemów operacyjnych\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-"%s: systemy operacyjne \"multiboot\" nie są obsługiwane przez opcję -i\n"
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr "%s: nie można zamontować niektórych systemów plików (zignorowano)\n"
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr "System operacyjny: %s\n"
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr "%s zamontowano w %s\n"
@@ -4025,3 +4052,11 @@ msgstr "virt-win-reg: {p}: nie można pobrać pliku rejestru: {err}\n"
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: nie można wysłać pliku rejestru: {err}\n"
+
+#~ msgid "%s: no operating system was found on this disk\n"
+#~ msgstr "%s: na tym dysku nie odnaleziono żadnych systemów operacyjnych\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr ""
+#~ "%s: systemy operacyjne \"multiboot\" nie są obsługiwane przez opcję -i\n"
diff --git a/po/ta.gmo b/po/ta.gmo
index c7c9670..029b066 100644
Binary files a/po/ta.gmo and b/po/ta.gmo differ
diff --git a/po/ta.po b/po/ta.po
index bf8586a..e962198 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil <tamil-users at lists.fedoraproject.org>\n"
@@ -2091,35 +2091,35 @@ msgstr "%s: தெரியாத கட்டளை\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2397,27 +2397,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr ""
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
diff --git a/po/te.gmo b/po/te.gmo
index 234c9ec..1e70c21 100644
Binary files a/po/te.gmo and b/po/te.gmo differ
diff --git a/po/te.po b/po/te.po
index 8b6f44e..dd28b3a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.net/projects/p/fedora/team/te/)\n"
@@ -2090,35 +2090,35 @@ msgstr "%s: తెలియని ఆదేశము\n"
msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
msgstr ""
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
"image\n"
msgstr ""
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr ""
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr ""
@@ -2395,27 +2395,55 @@ msgstr ""
msgid "%s: don't use --live and -i options together\n"
msgstr ""
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr ""
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr ""
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr ""
diff --git a/po/uk.gmo b/po/uk.gmo
index 17417c5..40a4794 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index 300f688..62e38a0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian <trans-uk at lists.fedoraproject.org>\n"
@@ -2288,7 +2288,7 @@ msgid "%s: %s: line %d: error parsing configuration file: %s\n"
msgstr ""
"%s: %s: рядок %d: помилка під час спроби обробки файла налаштувань: %s\n"
-#: fish/copy.c:41
+#: fish/copy.c:46
#, c-format
msgid ""
"use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2296,18 +2296,18 @@ msgstr ""
"скористайтеся командою «copy-in <локальний файл> [<локальний файл>...] "
"<віддалений каталог>» для копіювання файлів на образ\n"
-#: fish/copy.c:62
+#: fish/copy.c:67
#, c-format
msgid "copy-in: target '%s' is not a directory\n"
msgstr "copy-in: призначення «%s» не є каталогом\n"
-#: fish/copy.c:157
+#: fish/copy.c:164
#, c-format
msgid "error: argument is zero length or longer than maximum permitted\n"
msgstr ""
"помилка: аргумент нульової або вищої за максимальну дозволену довжини\n"
-#: fish/copy.c:202
+#: fish/copy.c:209
#, c-format
msgid ""
"use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2316,12 +2316,12 @@ msgstr ""
"скористайтеся командою «copy-out <віддалений файл> [<віддалений файл>...] "
"<локальний каталог>» для копіювання файлів з образу\n"
-#: fish/copy.c:213
+#: fish/copy.c:220
#, c-format
msgid "copy-out: target '%s' is not a directory\n"
msgstr "copy-out: призначення «%s» не є каталогом\n"
-#: fish/copy.c:258
+#: fish/copy.c:265
#, c-format
msgid "copy-out: '%s' is not a file or directory\n"
msgstr "copy-out: «%s» не є файлом або каталогом\n"
@@ -2689,29 +2689,55 @@ msgstr "hexedit: некоректний діапазон\n"
msgid "%s: don't use --live and -i options together\n"
msgstr "%s: не використовуйте одразу параметри --live і -i\n"
-#: fish/inspect.c:89
+#: fish/inspect.c:90
#, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: на цьому диску не виявлено операційної системи\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
-#: fish/inspect.c:96
+#: fish/inspect.c:111
#, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools. Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
msgstr ""
-"%s: для параметра -i не передбачено підтримки операційних систем з "
-"варіантами завантаження\n"
-#: fish/inspect.c:136
+#: fish/inspect.c:170
#, c-format
msgid "%s: some filesystems could not be mounted (ignored)\n"
msgstr "%s: деякі з файлових систем не вдалося змонтувати (проігноровано)\n"
-#: fish/inspect.c:148
+#: fish/inspect.c:182
#, c-format
msgid "Operating system: %s\n"
msgstr "Операційна система: %s\n"
-#: fish/inspect.c:161
+#: fish/inspect.c:195
#, c-format
msgid "%s mounted on %s\n"
msgstr "%s змонтовано до %s\n"
@@ -4070,3 +4096,12 @@ msgstr "virt-win-reg: {p}: не вдалося отримати файл рег
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: не вдалося вивантажити файл регістра: {err}\n"
+
+#~ msgid "%s: no operating system was found on this disk\n"
+#~ msgstr "%s: на цьому диску не виявлено операційної системи\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr ""
+#~ "%s: для параметра -i не передбачено підтримки операційних систем з "
+#~ "варіантами завантаження\n"
diff --git a/python/Makefile.in b/python/Makefile.in
index 39b93dd..7db00ab 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -1167,6 +1167,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/python/examples/Makefile.in b/python/examples/Makefile.in
index 1cb0176..9d9c562 100644
--- a/python/examples/Makefile.in
+++ b/python/examples/Makefile.in
@@ -1110,6 +1110,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/regressions/Makefile.in b/regressions/Makefile.in
index 4a0d9a6..0d05bc8 100644
--- a/regressions/Makefile.in
+++ b/regressions/Makefile.in
@@ -1157,6 +1157,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/rescue/Makefile.in b/rescue/Makefile.in
index 2eb35e7..28afde0 100644
--- a/rescue/Makefile.in
+++ b/rescue/Makefile.in
@@ -1168,6 +1168,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/resize/Makefile.in b/resize/Makefile.in
index ba9f242..069f76e 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -1133,6 +1133,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 757855a..8139140 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -49,14 +49,15 @@ TESTS = run-bindtests run-ruby-tests
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
- TMPDIR=$(top_builddir)
+ TMPDIR=$(top_builddir) \
+ RUBY=$(RUBY)
all: $(generator_built)
- rake build
- rake rdoc
+ $(RAKE) build
+ $(RAKE) rdoc
-RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
install:
$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
diff --git a/ruby/Makefile.in b/ruby/Makefile.in
index 54813ef..6f66259 100644
--- a/ruby/Makefile.in
+++ b/ruby/Makefile.in
@@ -1103,6 +1103,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
@@ -1225,10 +1226,11 @@ CLEANFILES = \
@HAVE_RUBY_TRUE at TESTS_ENVIRONMENT = \
@HAVE_RUBY_TRUE@ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
@HAVE_RUBY_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
- at HAVE_RUBY_TRUE@ TMPDIR=$(top_builddir)
+ at HAVE_RUBY_TRUE@ TMPDIR=$(top_builddir) \
+ at HAVE_RUBY_TRUE@ RUBY=$(RUBY)
- at HAVE_RUBY_TRUE@RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
- at HAVE_RUBY_TRUE@RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+ at HAVE_RUBY_TRUE@RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+ at HAVE_RUBY_TRUE@RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
all: all-am
.SUFFIXES:
@@ -1534,8 +1536,8 @@ appliance: force
$(MAKE) -C $(top_builddir)/appliance
@HAVE_RUBY_TRUE at all: $(generator_built)
- at HAVE_RUBY_TRUE@ rake build
- at HAVE_RUBY_TRUE@ rake rdoc
+ at HAVE_RUBY_TRUE@ $(RAKE) build
+ at HAVE_RUBY_TRUE@ $(RAKE) rdoc
@HAVE_RUBY_TRUE at install:
@HAVE_RUBY_TRUE@ $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
index f4bf901..9ae993b 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -38,7 +38,7 @@ CLOBBER.include [ "@builddir@/config.save", "@builddir@/ext/**/mkmf.log",
# Build locally
file MAKEFILE => EXT_CONF do |t|
- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/ext/guestfs; ruby #{EXT_CONF} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs"
+ unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/ext/guestfs; @RUBY@ #{EXT_CONF} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs"
$stderr.puts "Failed to run extconf"
break
end
diff --git a/ruby/examples/Makefile.in b/ruby/examples/Makefile.in
index f1cec31..7820110 100644
--- a/ruby/examples/Makefile.in
+++ b/ruby/examples/Makefile.in
@@ -1110,6 +1110,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/ruby/run-bindtests b/ruby/run-bindtests
index 4cac863..aafcfba 100755
--- a/ruby/run-bindtests
+++ b/ruby/run-bindtests
@@ -18,5 +18,5 @@
set -e
-ruby -I${srcdir}/lib -Iext/guestfs ${srcdir}/bindtests.rb > bindtests.tmp
+$RUBY -I${srcdir}/lib -Iext/guestfs ${srcdir}/bindtests.rb > bindtests.tmp
diff -u ${srcdir}/../bindtests bindtests.tmp
diff --git a/ruby/run-ruby-tests b/ruby/run-ruby-tests
index e21899a..c618241 100755
--- a/ruby/run-ruby-tests
+++ b/ruby/run-ruby-tests
@@ -22,6 +22,6 @@ set -e
# is bound to fail because they all use a single test image file).
for f in tests/tc_*.rb; do
- echo rake test "$@" TEST="$f"
- rake test "$@" TEST="$f"
+ echo $RAKE test "$@" TEST="$f"
+ $RAKE test "$@" TEST="$f"
done
diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
index 102154a..422291e 100644
--- a/sparsify/Makefile.in
+++ b/sparsify/Makefile.in
@@ -1133,6 +1133,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/src/Makefile.in b/src/Makefile.in
index a8cf8ff..0751e3e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1200,6 +1200,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/test-tool/Makefile.in b/test-tool/Makefile.in
index ab60fd1..727c6ef 100644
--- a/test-tool/Makefile.in
+++ b/test-tool/Makefile.in
@@ -1162,6 +1162,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index b8a8818..47fd69f 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1132,6 +1132,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
RPCGEN = @RPCGEN@
+RUBY = @RUBY@
SED = @SED@
SELINUX_LIB = @SELINUX_LIB@
SERVENT_LIB = @SERVENT_LIB@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list