call bootstrap_mic to do the bootstrap work

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

diff --git a/mic/creator.py b/mic/creator.py
index 5aa7ab3..17faa80 100644 (file)
--- a/mic/creator.py
+++ b/mic/creator.py
@@ -18,7 +18,7 @@
 import os, sys, re
 from optparse import SUPPRESS_HELP
 
-from mic import msger
+from mic import msger, rt_util
 from mic.utils import cmdln, errors, rpmmisc
 from conf import configmgr
 from plugin import pluginmgr
@@ -256,6 +256,10 @@ class Creator(cmdln.Cmdln):
         if os.geteuid() != 0:
             raise msger.error("Root permission is required, abort")
 
+        if configmgr.bootstrap['enable']:
+            configmgr._ksconf = argv[1]
+            rt_util.bootstrap_mic()
+
         return argv
 
     def do_auto(self, subcmd, opts, *args):

diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py
index 9d5e7a5..03b3b1b 100644 (file)
--- a/plugins/imager/fs_plugin.py
+++ b/plugins/imager/fs_plugin.py
@@ -18,7 +18,7 @@
 import os
 import sys
 
-from mic import chroot, msger, rt_util
+from mic import chroot, msger
 from mic.utils import cmdln, misc, errors, fs_related
 from mic.imager import fs
 from mic.conf import configmgr
@@ -75,9 +75,6 @@ class FsPlugin(ImagerPlugin):
             pkgmgrs = pluginmgr.get_plugins('backend').keys()
             raise errors.CreatorError("Can't find package manager: %s (availables: %s)" % (creatoropts['pkgmgr'], ', '.join(pkgmgrs)))
 
-        if creatoropts['runtime']:
-            rt_util.runmic_in_runtime(creatoropts['runtime'], creatoropts, ksconf, None)
-
         creator = fs.FsImageCreator(creatoropts, pkgmgr)
         creator._include_src = opts.include_src
 

diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py
index 0023023..680217e 100644 (file)
--- a/plugins/imager/livecd_plugin.py
+++ b/plugins/imager/livecd_plugin.py
@@ -19,7 +19,7 @@ import os
 import shutil
 import tempfile
 
-from mic import chroot, msger, rt_util
+from mic import chroot, msger
 from mic.utils import misc, fs_related, errors
 from mic.conf import configmgr
 import mic.imager.livecd as livecd
@@ -75,9 +75,6 @@ class LiveCDPlugin(ImagerPlugin):
             pkgmgrs = pluginmgr.get_plugins('backend').keys()
             raise errors.CreatorError("Can't find package manager: %s (availables: %s)" % (creatoropts['pkgmgr'], ', '.join(pkgmgrs)))
 
-        if creatoropts['runtime']:
-            rt_util.runmic_in_runtime(creatoropts['runtime'], creatoropts, ksconf, None)
-
         creator = livecd.LiveCDImageCreator(creatoropts, pkgmgr)
 
         if len(recording_pkgs) > 0:

diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py
index 1e18100..4b357e4 100644 (file)
--- a/plugins/imager/liveusb_plugin.py
+++ b/plugins/imager/liveusb_plugin.py
@@ -19,7 +19,7 @@ import os
 import shutil
 import tempfile
 
-from mic import chroot, msger, rt_util
+from mic import chroot, msger
 from mic.utils import misc, fs_related, errors
 from mic.utils.partitionedfs import PartitionedMount
 from mic.conf import configmgr
@@ -77,9 +77,6 @@ class LiveUSBPlugin(ImagerPlugin):
             pkgmgrs = pluginmgr.get_plugins('backend').keys()
             raise errors.CreatorError("Can't find package manager: %s (availables: %s)" % (creatoropts['pkgmgr'], ', '.join(pkgmgrs)))
 
-        if creatoropts['runtime']:
-            rt_util.runmic_in_runtime(creatoropts['runtime'], creatoropts, ksconf, None)
-
         creator = liveusb.LiveUSBImageCreator(creatoropts, pkgmgr)
 
         if len(recording_pkgs) > 0:

diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py
index 9986992..28171b7 100644 (file)
--- a/plugins/imager/loop_plugin.py
+++ b/plugins/imager/loop_plugin.py
@@ -19,7 +19,7 @@ import os
 import shutil
 import tempfile
 
-from mic import chroot, msger, rt_util
+from mic import chroot, msger
 from mic.utils import misc, fs_related, errors, cmdln
 from mic.conf import configmgr
 from mic.plugin import pluginmgr
@@ -85,9 +85,6 @@ class LoopPlugin(ImagerPlugin):
                                       % (creatoropts['pkgmgr'],
                                          ', '.join(pkgmgrs)))
 
-        if creatoropts['runtime']:
-            rt_util.runmic_in_runtime(creatoropts['runtime'], creatoropts, ksconf, None)
-
         creator = LoopImageCreator(creatoropts,
                                    pkgmgr,
                                    opts.compress_image,

diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 89c1f76..e536443 100644 (file)
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -20,7 +20,7 @@ import shutil
 import re
 import tempfile
 
-from mic import chroot, msger, rt_util
+from mic import chroot, msger
 from mic.utils import misc, fs_related, errors, runner, cmdln
 from mic.conf import configmgr
 from mic.plugin import pluginmgr
@@ -80,9 +80,6 @@ class RawPlugin(ImagerPlugin):
             pkgmgrs = pluginmgr.get_plugins('backend').keys()
             raise errors.CreatorError("Can't find package manager: %s (availables: %s)" % (creatoropts['pkgmgr'], ', '.join(pkgmgrs)))
 
-        if creatoropts['runtime']:
-            rt_util.runmic_in_runtime(creatoropts['runtime'], creatoropts, ksconf, None)
-
         creator = raw.RawImageCreator(creatoropts, pkgmgr, opts.compress_image)
 
         if len(recording_pkgs) > 0: