Fix kickstart issue

Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 7a68eb5..4089d10 100644 (file)
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -32,7 +32,7 @@ from mic.utils.errors import *
 from mic.utils.fs_related import *
 from mic.utils.rpmmisc import *
 from mic.utils.misc import *
-from mic.utils import kickstart
+from mic import kickstart
 from mic import msger
 
 class BaseImageCreator(object):

diff --git a/mic/imager/fs.py b/mic/imager/fs.py
index 4c64d36..3b25384 100644 (file)
--- a/mic/imager/fs.py
+++ b/mic/imager/fs.py
@@ -32,9 +32,9 @@ import rpm
 
 from mic.utils.errors import *
 from mic.utils.fs_related import *
-from mic.utils import kickstart
 from mic.utils.rpmmisc import *
 from mic.utils.misc import *
+from mic import kickstart
 from baseimager import BaseImageCreator
 
 

diff --git a/mic/imager/livecd.py b/mic/imager/livecd.py
index acb2042..072ae60 100644 (file)
--- a/mic/imager/livecd.py
+++ b/mic/imager/livecd.py
@@ -25,7 +25,7 @@ import logging
 import re
 import time
 
-import mic.utils.kickstart as kickstart
+import mic.kickstart as kickstart
 import mic.utils.fs_related as fs_related
 import mic.utils.rpmmisc as rpmmisc
 import mic.utils.misc as misc

diff --git a/mic/imager/loop.py b/mic/imager/loop.py
index 29962fc..bd584fa 100644 (file)
--- a/mic/imager/loop.py
+++ b/mic/imager/loop.py
@@ -19,7 +19,7 @@
 import os
 import os.path
 import subprocess
-import mic.utils.kickstart as kickstart
+import mic.kickstart as kickstart
 from baseimager import BaseImageCreator
 from mic.utils.errors import *
 from mic.utils.fs_related import *

diff --git a/mic/imager/raw.py b/mic/imager/raw.py
index 992bf62..5aa0d9f 100644 (file)
--- a/mic/imager/raw.py
+++ b/mic/imager/raw.py
@@ -26,7 +26,7 @@ import tarfile
 import subprocess
 import logging
 
-import mic.utils.kickstart as kickstart
+import mic.kickstart as kickstart
 import mic.utils.fs_related as fs_related
 import urlgrabber.progress as progress
 from baseimager import BaseImageCreator

diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py
index b957719..8e28003 100644 (file)
--- a/mic/kickstart/__init__.py
+++ b/mic/kickstart/__init__.py
@@ -28,7 +28,7 @@ from mic.utils import misc
 from mic.utils import fs_related as fs
 from mic import msger
 
-sys.path.append(os.path.dirname(__file__) or '.')
+sys.path.insert(0, os.path.dirname(__file__) or '.')
 import pykickstart
 
 import pykickstart.commands as kscommands