X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Finspect_fs_unix.c;h=b8be049b54c0a7e53d1eab9199c97ee4d32d0988;hb=6146412f06c2f6f33c3ea7d571f16d4fe71dddb2;hp=2ea29ad83f5a360244c60261469e0bd9c58c0fe2;hpb=41cd0e302d6554facd6b9f7daaa78304361efaef;p=libguestfs.git

diff --git a/src/inspect_fs_unix.c b/src/inspect_fs_unix.c
index 2ea29ad..b8be049 100644
--- a/src/inspect_fs_unix.c
+++ b/src/inspect_fs_unix.c
@@ -543,11 +543,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;
 }