diff options
| -rw-r--r-- | plugins/imager/fs_plugin.py | 10 | ||||
| -rw-r--r-- | plugins/imager/livecd_plugin.py | 10 | ||||
| -rw-r--r-- | plugins/imager/liveusb_plugin.py | 10 | ||||
| -rw-r--r-- | plugins/imager/loop_plugin.py | 12 | ||||
| -rw-r--r-- | plugins/imager/qcow_plugin.py | 10 | ||||
| -rw-r--r-- | plugins/imager/raw_plugin.py | 10 |
6 files changed, 1 insertions, 61 deletions
diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py index b6b7962..faee633 100644 --- a/plugins/imager/fs_plugin.py +++ b/plugins/imager/fs_plugin.py @@ -49,16 +49,6 @@ class FsPlugin(ImagerPlugin): if creatoropts['runtime'] == 'bootstrap': configmgr._ksconf = ksconf rt_util.bootstrap_mic() - elif not rt_util.inbootstrap(): - try: - fs_related.find_binary_path('mic-native') - except errors.CreatorError: - if not msger.ask("Subpackage \"mic-native\" has not been " - "installed in your host system, still " - "continue with \"native\" running mode?", - False): - raise errors.Abort("Abort because subpackage 'mic-native' " - "has not been installed") recording_pkgs = [] if len(creatoropts['record_pkgs']) > 0: diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py index 3b45b5a..b4291b1 100644 --- a/plugins/imager/livecd_plugin.py +++ b/plugins/imager/livecd_plugin.py @@ -48,16 +48,6 @@ class LiveCDPlugin(ImagerPlugin): if creatoropts['runtime'] == 'bootstrap': configmgr._ksconf = ksconf rt_util.bootstrap_mic() - elif not rt_util.inbootstrap(): - try: - fs_related.find_binary_path('mic-native') - except errors.CreatorError: - if not msger.ask("Subpackage \"mic-native\" has not been " - "installed in your host system, still " - "continue with \"native\" running mode?", - False): - raise errors.Abort("Abort because subpackage 'mic-native' " - "has not been installed") if creatoropts['arch'] and creatoropts['arch'].startswith('arm'): msger.warning('livecd cannot support arm images, Quit') diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py index a2f300f..ed0cb26 100644 --- a/plugins/imager/liveusb_plugin.py +++ b/plugins/imager/liveusb_plugin.py @@ -50,16 +50,6 @@ class LiveUSBPlugin(ImagerPlugin): if creatoropts['runtime'] == "bootstrap": configmgr._ksconf = ksconf rt_util.bootstrap_mic() - elif not rt_util.inbootstrap(): - try: - fs_related.find_binary_path('mic-native') - except errors.CreatorError: - if not msger.ask("Subpackage \"mic-native\" has not been " - "installed in your host system, still " - "continue with \"native\" running mode?", - False): - raise errors.Abort("Abort because subpackage 'mic-native' " - "has not been installed") if creatoropts['arch'] and creatoropts['arch'].startswith('arm'): msger.warning('liveusb cannot support arm images, Quit') diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py index e306ad1..f0f2771 100644 --- a/plugins/imager/loop_plugin.py +++ b/plugins/imager/loop_plugin.py @@ -57,17 +57,7 @@ class LoopPlugin(ImagerPlugin): if creatoropts['runtime'] == "bootstrap": configmgr._ksconf = ksconf rt_util.bootstrap_mic() - elif not rt_util.inbootstrap(): - try: - fs_related.find_binary_path('mic-native') - except errors.CreatorError: - if not msger.ask("Subpackage \"mic-native\" has not been " - "installed in your host system, still " - "continue with \"native\" running mode?", - False): - raise errors.Abort("Abort because subpackage 'mic-native' " - "has not been installed") - + recording_pkgs = [] if len(creatoropts['record_pkgs']) > 0: recording_pkgs = creatoropts['record_pkgs'] diff --git a/plugins/imager/qcow_plugin.py b/plugins/imager/qcow_plugin.py index 03ed0da..17b707c 100644 --- a/plugins/imager/qcow_plugin.py +++ b/plugins/imager/qcow_plugin.py @@ -81,16 +81,6 @@ class QcowPlugin(ImagerPlugin): if creatoropts['runtime'] == "bootstrap": configmgr._ksconf = ksconf rt_util.bootstrap_mic() - elif not rt_util.inbootstrap(): - try: - fs_related.find_binary_path('mic-native') - except errors.CreatorError: - if not msger.ask("Subpackage \"mic-native\" has not been " - "installed in your host system, still " - "continue with \"native\" running mode?", - False): - raise errors.Abort("Abort because subpackage 'mic-native' " - "has not been installed") recording_pkgs = [] if len(creatoropts['record_pkgs']) > 0: diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py index 0aec1d1..3eef33a 100644 --- a/plugins/imager/raw_plugin.py +++ b/plugins/imager/raw_plugin.py @@ -63,16 +63,6 @@ class RawPlugin(ImagerPlugin): if creatoropts['runtime'] == "bootstrap": configmgr._ksconf = ksconf rt_util.bootstrap_mic() - elif not rt_util.inbootstrap(): - try: - fs_related.find_binary_path('mic-native') - except errors.CreatorError: - if not msger.ask("Subpackage \"mic-native\" has not been " - "installed in your host system, still " - "continue with \"native\" running mode?", - False): - raise errors.Abort("Abort because subpackage 'mic-native' " - "has not been installed") recording_pkgs = [] if len(creatoropts['record_pkgs']) > 0: |