Ensure MIC works well when "/etc/mic/mic.conf" does not exist

when "/etc/mic/mic.conf" does not exist, ensure MIC works in
native mode, and when requring bootstrap mode, MIC switches to
native mode to work,because bootstrap mode needs the existence
of "/etc/mic/mic.conf".

Fixes: #1196

Change-Id: Idf16cbb4da7748665f466eb3f2045a853821915e

diff --git a/mic/conf.py b/mic/conf.py
index 1de644f..e29bd3b 100644 (file)
--- a/mic/conf.py
+++ b/mic/conf.py
@@ -47,6 +47,7 @@ class ConfigMgr(object):
                     "cachedir": '/var/tmp/mic/cache',
                     "outdir": './mic-output',
 
+                    "plugin_dir": "/usr/lib/mic/plugins",
                     "arch": None, # None means auto-detect
                     "pkgmgr": "auto",
                     "name": "output",
@@ -78,6 +79,7 @@ class ConfigMgr(object):
                 'bootstrap': {
                     "rootdir": '/var/tmp/mic-bootstrap',
                     "packages": [],
+                    "distro_name": "",
                 },
                }
 

diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 0dd1621..2f517b7 100644 (file)
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -64,6 +64,7 @@ class BaseImageCreator(object):
         """
 
         self.pkgmgr = pkgmgr
+        self.distro_name = ""
 
         self.__builddir = None
         self.__bindmounts = []