X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Finspect.c;h=07af81882a1e15cf50a559533358e2eaa788f902;hb=8ab2b85b2a67270b8cc5a91bb62a70c84cd6a02c;hp=713501e90c19669c672308d44ab66157d7e5219d;hpb=0c60e4d9dd6549c2135699490ba8a9ec1dd50ab9;p=libguestfs.git

diff --git a/fish/inspect.c b/fish/inspect.c
index 713501e..07af818 100644
--- a/fish/inspect.c
+++ b/fish/inspect.c
@@ -73,6 +73,12 @@ compare_keys (const void *p1, const void *p2)
 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);
@@ -136,7 +142,7 @@ void
 print_inspect_prompt (void)
 {
   char *name = guestfs_inspect_get_product_name (g, root);
-  if (STRNEQ (name, "unknown"))
+  if (name && STRNEQ (name, "unknown"))
     printf (_("Operating system: %s\n"), name);
   free (name);