X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Finspect.c;h=12cecfa839e2c83bef1725794588ff69938bdc57;hb=da66e55fad2aafe2bf2ba9ebc4824893a27058b2;hp=33da1441c25bbafd826020ffef857c276aaae107;hpb=7badf512f6859c2585c434a6d3f5772979bb5131;p=libguestfs.git

diff --git a/src/inspect.c b/src/inspect.c
index 33da144..12cecfa 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -29,7 +29,6 @@
 #include <pcre.h>
 #include <magic.h>
 #include <hivex.h>
-#include <augeas.h>
 
 #include "c-ctype.h"
 #include "ignore-value.h"
@@ -46,7 +45,6 @@
  * simultaneously.
  */
 static pcre *re_file_elf;
-static pcre *re_file_win64;
 static pcre *re_elf_ppc64;
 static pcre *re_fedora;
 static pcre *re_rhel_old;
@@ -95,7 +93,6 @@ static void
 free_regexps (void)
 {
   pcre_free (re_file_elf);
-  pcre_free (re_file_win64);
   pcre_free (re_elf_ppc64);
   pcre_free (re_fedora);
   pcre_free (re_rhel_old);
@@ -818,6 +815,15 @@ check_linux_root (guestfs_h *g, struct inspect_fs *fs)
     if (parse_major_minor (g, fs) == -1)
       return -1;
   }
+  else if (guestfs_exists (g, "/etc/meego-release") > 0) {
+    fs->distro = OS_DISTRO_MEEGO;
+
+    if (parse_release_file (g, fs, "/etc/meego-release") == -1)
+      return -1;
+
+    if (parse_major_minor (g, fs) == -1)
+      return -1;
+  }
 
  skip_release_checks:;
 
@@ -849,7 +855,7 @@ check_linux_root (guestfs_h *g, struct inspect_fs *fs)
    * are mounted.
    * XXX What if !feature_available (g, "augeas")?
    */
-  if (guestfs_aug_init (g, "/", AUG_NO_LOAD|AUG_SAVE_NOOP) == -1)
+  if (guestfs_aug_init (g, "/", 16|32) == -1)
     return -1;
 
   /* Tell Augeas to only load /etc/fstab (thanks Raphaël Pinson). */
@@ -1338,6 +1344,7 @@ guestfs__inspect_get_distro (guestfs_h *g, const char *root)
   case OS_DISTRO_DEBIAN: ret = safe_strdup (g, "debian"); break;
   case OS_DISTRO_FEDORA: ret = safe_strdup (g, "fedora"); break;
   case OS_DISTRO_GENTOO: ret = safe_strdup (g, "gentoo"); break;
+  case OS_DISTRO_MEEGO: ret = safe_strdup (g, "meego"); break;
   case OS_DISTRO_PARDUS: ret = safe_strdup (g, "pardus"); break;
   case OS_DISTRO_REDHAT_BASED: ret = safe_strdup (g, "redhat-based"); break;
   case OS_DISTRO_RHEL: ret = safe_strdup (g, "rhel"); break;