From: yan11.meng Date: Tue, 10 Dec 2019 06:50:19 +0000 (+0800) Subject: add option for mic to skip set hosts when create X-Git-Tag: accepted/tizen/devbase/tools/20191220.065431^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84d42de8a53a775fd5b8b851a7218d2fb8d3161d;p=tools%2Fmic.git add option for mic to skip set hosts when create https://bugs.tizen.org/browse/DEVT-394 Change-Id: I4c9877b265e615e8f5e1d4ce2b52f4b93da0aed4 Signed-off-by: yan11.meng --- diff --git a/mic/cmd_create.py b/mic/cmd_create.py index 203d08d..ab353a8 100755 --- a/mic/cmd_create.py +++ b/mic/cmd_create.py @@ -148,6 +148,9 @@ def main(parser, args, argv): if args.pkgmgr is not None: configmgr.create['pkgmgr'] = args.pkgmgr + if args.skip_set_hosts: + configmgr.create['skip_set_hosts']=args.skip_set_hosts + if args.runtime: configmgr.set_runtime(args.runtime) diff --git a/mic/conf.py b/mic/conf.py index c03aab2..031c1af 100755 --- a/mic/conf.py +++ b/mic/conf.py @@ -79,6 +79,7 @@ class ConfigMgr(object): "run_script": None, "tpk_install": None, "use_mic_in_bootstrap": False, + "skip_set_hosts": False, }, 'chroot': { "saveto": None, diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py index c59e2c6..0c3959e 100755 --- a/mic/kickstart/__init__.py +++ b/mic/kickstart/__init__.py @@ -36,7 +36,6 @@ from mic.utils import errors, misc, runner, fs_related as fs from custom_commands import desktop, micrepo, micboot, partition, installerfw from mic.utils.safeurl import SafeURL - AUTH_URL_PTN = r"(?P.*)://(?P.*)(:?P.*)?@(?P.*)" @@ -672,7 +671,11 @@ class NetworkConfig(KickstartConfig): nameservers = network.nameserver.split(",") self.write_sysconfig(useipv6, hostname, gateway) - self.write_hosts(hostname) + + #to avoid import error because of import each other + from mic.conf import configmgr + if configmgr.create['skip_set_hosts'] == False: + self.write_hosts(hostname) self.write_resolv(nodns, nameservers) def use_installerfw(ks, feature): diff --git a/tools/mic b/tools/mic index 6cbfb45..fc4fb2c 100755 --- a/tools/mic +++ b/tools/mic @@ -142,6 +142,7 @@ def create_parser(parser): parent_parser.add_argument('--tpk_install', action='store', dest='tpk_install', default=None, help='Copy tpk file to /usr/apps/.preload-tpk') parent_parser.add_argument('--rpm-debug', action='store_true', dest='rpm_debug', help='Set debug mode for rpm install') + parent_parser.add_argument('--skip-set-hosts', action='store_true', dest='skip_set_hosts', default=False, help='choose to skip set hosts by mic') parser.set_defaults(alias="cr")