Remove hardcoded distro name.

Signed-off-by: Marko Saukko <marko.saukko@cybercom.com>

diff --git a/distfiles/mic.conf b/distfiles/mic.conf
index fc20dfb..c623c7f 100644 (file)
--- a/distfiles/mic.conf
+++ b/distfiles/mic.conf
@@ -7,6 +7,7 @@ tmpdir= /var/tmp/mic
 cachedir= /var/tmp/mic/cache
 outdir= ./mic-output
 pkgmgr = zypp
+distro_name = Tizen
 
 ; proxy = http://proxy.yourcompany.com:8080/
 ; no_proxy = localhost,127.0.0.0/8,.yourcompany.com

diff --git a/mic/conf.py b/mic/conf.py
index dc241a0..7a29834 100644 (file)
--- a/mic/conf.py
+++ b/mic/conf.py
@@ -41,6 +41,7 @@ class ConfigMgr(object):
                     "logfile": None,
                     "record_pkgs": [],
                     "compress_disk_image": None,
+                    "distro_name": "Default Distribution",
                 },
                 'chroot': {},
                 'convert': {},

diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 9f8f2f8..31d0d17 100644 (file)
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -109,8 +109,7 @@ class BaseImageCreator(object):
 
         self._dep_checks = ["ls", "bash", "cp", "echo", "modprobe", "passwd"]
 
-        #FIXME to be obsolete, make it configurable
-        self.distro_name = "Tizen"
+        self.distro_name = createopts['distro_name']
 
         # Output image file names
         self.outimage = []