git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
fish
/
inspect.c
diff --git
a/fish/inspect.c
b/fish/inspect.c
index
28c1b88
..
5e1948c
100644
(file)
--- a/
fish/inspect.c
+++ b/
fish/inspect.c
@@
-73,6
+73,12
@@
compare_keys (const void *p1, const void *p2)
void
inspect_mount (void)
{
void
inspect_mount (void)
{
+ if (live) {
+ fprintf (stderr, _("%s: don't use --live and -i options together\n"),
+ program_name);
+ exit (EXIT_FAILURE);
+ }
+
inspect_do_decrypt ();
char **roots = guestfs_inspect_os (g);
inspect_do_decrypt ();
char **roots = guestfs_inspect_os (g);
@@
-111,6
+117,7
@@
inspect_mount_root (const char *root)
compare_keys_len);
size_t i;
compare_keys_len);
size_t i;
+ size_t mount_errors = 0;
for (i = 0; mountpoints[i] != NULL; i += 2) {
int r;
if (!read_only)
for (i = 0; mountpoints[i] != NULL; i += 2) {
int r;
if (!read_only)
@@
-118,10
+125,14
@@
inspect_mount_root (const char *root)
else
r = guestfs_mount_ro (g, mountpoints[i+1], mountpoints[i]);
if (r == -1)
else
r = guestfs_mount_ro (g, mountpoints[i+1], mountpoints[i]);
if (r == -1)
-
exit (EXIT_FAILURE)
;
+
mount_errors++
;
}
free_strings (mountpoints);
}
free_strings (mountpoints);
+
+ if (mount_errors)
+ fprintf (stderr, _("%s: some filesystems could not be mounted (ignored)\n"),
+ program_name);
}
/* This function is called only if the above function was called,
}
/* This function is called only if the above function was called,