From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 29 Jul 2011 16:38:43 +0000 (+0100)
Subject: Don't fail if HOSTNAME field is missing on Red Hat guests (RHBZ#726739).
X-Git-Tag: 1.10.7~8
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=650cd79f54ee42523a517fdbf19b170803d422f5;p=libguestfs.git

Don't fail if HOSTNAME field is missing on Red Hat guests (RHBZ#726739).
(cherry picked from commit bad3f4b54a959685f3c0697238fc5753096834fb)
---

diff --git a/src/inspect_fs_unix.c b/src/inspect_fs_unix.c
index a34d691..fcc907b 100644
--- a/src/inspect_fs_unix.c
+++ b/src/inspect_fs_unix.c
@@ -545,11 +545,18 @@ check_hostname_redhat (guestfs_h *g, struct inspect_fs *fs)
 {
   char *hostname;
 
+  /* Errors here are not fatal (RHBZ#726739), since it could be
+   * just missing HOSTNAME field in the file.
+   */
+  guestfs_error_handler_cb old_error_cb = g->error_cb;
+  g->error_cb = NULL;
   hostname = guestfs_aug_get (g, "/files/etc/sysconfig/network/HOSTNAME");
-  if (!hostname)
-    return -1;
+  g->error_cb = old_error_cb;
 
-  fs->hostname = hostname;  /* freed by guestfs___free_inspect_info */
+  /* This is freed by guestfs___free_inspect_info.  Note that hostname
+   * could be NULL because we ignored errors above.
+   */
+  fs->hostname = hostname;
   return 0;
 }