From ffe8bc57d40e7e9ec63c79d50c8dcb291ee10c2d Mon Sep 17 00:00:00 2001 From: zhongning5 Date: Thu, 22 Feb 2024 17:38:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9init=20=E5=90=88=E6=B3=95?= =?UTF-8?q?=E6=80=A7=E6=A3=80=E6=9F=A5=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhongning5 --- tools/deps_guard/deps_guard.py | 2 +- .../config_parser_mgr/cfg/config_parser.py | 10 +++++----- .../config_parser_mgr/param/system_parameter_parser.py | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/deps_guard/deps_guard.py b/tools/deps_guard/deps_guard.py index 71ac61f..d216272 100755 --- a/tools/deps_guard/deps_guard.py +++ b/tools/deps_guard/deps_guard.py @@ -62,7 +62,7 @@ def _startup_guard_module(out_path, args): def deps_guard(out_path, args=None): _deps_guard_module(out_path, args) - #_startup_guard_module(out_path, args) + _startup_guard_module(out_path, args) if __name__ == '__main__': diff --git a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py index a6a2c5e..9a88c3d 100644 --- a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py +++ b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py @@ -432,10 +432,10 @@ class ConfigParser(): def scan_config(self): config_paths = [ - "/system/etc/init", - "/chip_prod/etc/init", - "/sys_prod/etc/init", - "/vendor/etc/init", + "system/etc/init", + "chip_prod/etc/init", + "sys_prod/etc/init", + "vendor/etc/init", ] for file_name in config_paths: self._scan_config_file(file_name) @@ -504,7 +504,7 @@ def startup_config_collect(base_path): parser = ConfigParser(os.path.join(base_path, "packages/phone")) parser.load_config("/system/etc/init.cfg") parser.scan_config() - parser.load_selinux_config("/system/etc/selinux/config") + parser.load_selinux_config("system/etc/selinux/config") return parser if __name__ == '__main__': diff --git a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py index 46bcfbd..b2a41c0 100644 --- a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py +++ b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py @@ -78,6 +78,7 @@ class ParameterFileParser(): self._parameters = {} def _handle_param_info(self, file_name, param_info): + print(param_info) param_name = param_info[0].strip() old_param = self._parameters.get(param_name) if file_name.endswith(".para.dac"): @@ -94,10 +95,14 @@ class ParameterFileParser(): self._parameters[param_name] = param def load_parameter_file(self, file_name, str = "="): + print("** ", file_name) try: with open(file_name, encoding='utf-8') as fp: line = fp.readline() while line : + if line.startswith("/*"): + print("fileName = ", file_name) + continue if line.startswith("#") or len(line) < 3: line = fp.readline() continue -- Gitee From 3bb8b743e081289f8660a15fb536430ff4c55f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E6=9F=A0?= Date: Mon, 26 Feb 2024 10:35:03 +0000 Subject: [PATCH 2/2] update tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 钟柠 --- .../config_parser_mgr/param/system_parameter_parser.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py index b2a41c0..46bcfbd 100644 --- a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py +++ b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py @@ -78,7 +78,6 @@ class ParameterFileParser(): self._parameters = {} def _handle_param_info(self, file_name, param_info): - print(param_info) param_name = param_info[0].strip() old_param = self._parameters.get(param_name) if file_name.endswith(".para.dac"): @@ -95,14 +94,10 @@ class ParameterFileParser(): self._parameters[param_name] = param def load_parameter_file(self, file_name, str = "="): - print("** ", file_name) try: with open(file_name, encoding='utf-8') as fp: line = fp.readline() while line : - if line.startswith("/*"): - print("fileName = ", file_name) - continue if line.startswith("#") or len(line) < 3: line = fp.readline() continue -- Gitee