From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Tue, 21 May 2013 14:08:40 +0000 (+0300)
Subject: Copy OSFAMILY to OS property if distro is unknown
X-Git-Tag: v0.3~7
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/d8a12a7ee6817c93a400af602ebf1366c1309cbb

Copy OSFAMILY to OS property if distro is unknown

If libguestfs's inspect_get_distro returns "unknown", then use the
OSFAMILY image property value as OS value.
---

diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index 92dde0d..181bf5d 100644
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -82,6 +82,8 @@ class OSBase(object):
         self.meta['ROOT_PARTITION'] = "%d" % self.g.part_to_partnum(self.root)
         self.meta['OSFAMILY'] = self.g.inspect_get_type(self.root)
         self.meta['OS'] = self.g.inspect_get_distro(self.root)
+        if self.meta['OS'] == "unknown":
+            self.meta['OS'] = self.meta['OSFAMILY']
         self.meta['DESCRIPTION'] = self.g.inspect_get_product_name(self.root)
 
     def _is_sysprep(self, obj):