From 4191bec29d84f02c66db68a26dc718c127390d5e Mon Sep 17 00:00:00 2001 From: zhong_ning Date: Sat, 31 Jul 2021 20:50:07 +0800 Subject: [PATCH] add ohos.para Signed-off-by: zhong_ning --- services/BUILD.gn | 7 +++ services/etc/init.cfg | 93 ++---------------------------------- services/etc/ohos.para | 36 ++++++++++++++ services/src/init_read_cfg.c | 5 +- 4 files changed, 47 insertions(+), 94 deletions(-) create mode 100755 services/etc/ohos.para diff --git a/services/BUILD.gn b/services/BUILD.gn index a317ab1b7..567c24b76 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -194,6 +194,12 @@ if (defined(ohos_lite)) { "//device/hisilicon/hi3516dv300/build/rootfs/init.Hi3516DV300.usb.cfg" part_name = "init" } + + ohos_prebuilt_etc("ohos.para") { + source = "//base/startup/init_lite/services/etc/ohos.para" + part_name = "init" + } + group("init_etc") { deps = [ ":init.Hi3516DV300.cfg", @@ -203,6 +209,7 @@ if (defined(ohos_lite)) { ":init.usb.configfs.cfg", ":passwd", ":group", + ":ohos.para", ] } } diff --git a/services/etc/init.cfg b/services/etc/init.cfg index 80028317b..96afbbc23 100755 --- a/services/etc/init.cfg +++ b/services/etc/init.cfg @@ -2,9 +2,6 @@ "import" : [ "/init.environ.cfg", "/init.usb.cfg", - "/init.${ro.hardware}.cfg", - "/init.usb.configfs.cfg", - "/init.${ro.zygote}.cfg", "/init.usb.configfs.cfg", "/init.usb.cfg", "/init.Hi3516DV300.usb.cfg", @@ -28,9 +25,6 @@ }, { "name" : "init", "cmds" : [ - "load_param /vendor/build.prop", - "load_param /vendor/default.prop", - "load_param /vendor/odm/etc/build.prop", "copy /proc/cmdline /dev/urandom", "copy /system/etc/prop.default /dev/urandom", "symlink /proc/self/fd/0 /dev/stdin", @@ -184,11 +178,7 @@ "chmod 0444 /dev/cpu_variant:${ro.bionic.2nd_arch}", "chown system system /sys/power/state", "chown system system /sys/power/wakeup_count", - "chmod 0660 /sys/power/state", - "start logd", - "start servicemanager", - "start hwservicemanager", - "start vndservicemanager" + "chmod 0660 /sys/power/state" ] }, { "name" : "param:sys.boot_from_charger_mode=1", @@ -199,9 +189,7 @@ }, { "name" : "load_persist_props_action", "cmds" : [ - "load_persist_params load_persist_params", - "start logd", - "start logd-reinit" + "load_persist_params load_persist_params" ] }, { "name" : "firmware_mounts_complete", @@ -217,7 +205,6 @@ "trigger late-fs", "trigger post-fs-data", "trigger load_persist_props_action", - "trigger zygote-start", "trigger firmware_mounts_complete", "trigger early-boot", "trigger boot" @@ -250,12 +237,7 @@ "chown system log /proc/last_kmsg", "chmod 0440 /proc/last_kmsg", "chmod 0444 /sys/fs/selinux/policy", - "mkdir /cache/lost+found 0770 root root", - "mkdir /metadata/vold", - "chmod 0700 /metadata/vold", - "mkdir /metadata/password_slots 0771 root system", - "mkdir /metadata/apex 0700 root system", - "mkdir /metadata/apex/sessions 0700 root system" + "mkdir /cache/lost+found 0770 root root" ] }, { "name" : "late-fs", @@ -265,18 +247,10 @@ }, { "name" : "post-fs-data", "cmds" : [ - "start vold", - "exec - system system -- /system/bin/vdc checkpoint prepareCheckpoint", "chown system system /data", "chmod 0771 /data", "mkdir /data/bootchart 0755 shell shell", - "exec -- /system/bin/fsverity_init", - "mkdir /data/apex 0750 root system", - "mkdir /data/apex/active 0750 root system", - "mkdir /data/apex/backup 0700 root system", - "mkdir /data/apex/sessions 0700 root system", "mkdir /data/app-staging 0750 system system", - "start apexd", "copy /data/system/entropy.dat /dev/urandom", "mkdir /data/misc 01771 system misc", "mkdir /data/misc/recovery 0770 system log", @@ -348,11 +322,6 @@ "mkdir /data/app-asec 0700 root root", "mkdir /data/app-lib 0771 system system", "mkdir /data/app 0771 system system", - "mkdir /data/property 0700 root root", - "mkdir /data/tombstones 0771 system system", - "mkdir /data/vendor/tombstones 0771 root root", - "mkdir /data/vendor/tombstones/wifi 0771 wifi wifi", - "mkdir /data/dalvik-cache 0771 root root", "mkdir /data/ota 0771 root root", "mkdir /data/ota_package 0770 system cache", "mkdir /data/resource-cache 0771 system system", @@ -361,7 +330,6 @@ "mkdir /data/lost+found 0770 root root", "mkdir /data/drm 0770 drm drm", "mkdir /data/mediadrm 0770 mediadrm mediadrm", - "mkdir /data/anr 0775 system system", "mkdir /data/nfc 0770 nfc nfc", "mkdir /data/nfc/param 0770 nfc nfc", "mkdir /data/backup 0700 system system", @@ -383,7 +351,6 @@ "mkdir /data/cache/recovery 0770 system cache", "mkdir /data/cache/backup_stage 0700 system system", "mkdir /data/cache/backup 0700 system system", - "exec - system system -- /system/bin/tzdatacheck /apex/com.android.runtime/etc/tz /data/misc/zoneinfo", "setparam sys.use_memfd false", "chown root system /dev/fscklogs/log", "chmod 0770 /dev/fscklogs/log" @@ -466,56 +433,6 @@ "chown root radio /proc/cmdline", "setparam net.tcp.default_init_rwnd 60" ] - }, { - "name" : "nonencrypted", - "cmds" : [ - ] - }, { - "name" : "param:sys.init_log_level=*", - "condition" : "sys.init_log_level=*", - "cmds" : [ - ] - }, { - "name" : "charger", - "cmds" : [ - ] - }, { - "name" : "param:vold.decrypt=trigger_load_persist_props", - "condition" : "vold.decrypt=trigger_load_persist_props", - "cmds" : [ - "load_persist_params load_persist_params", - "start logd", - "start logd-reinit" - ] - }, { - "name" : "param:vold.decrypt=trigger_post_fs_data", - "condition" : "vold.decrypt=trigger_post_fs_data", - "cmds" : [ - "trigger post-fs-data", - "trigger zygote-start" - ] - }, { - "name" : "param:vold.decrypt=trigger_restart_min_framework", - "condition" : "vold.decrypt=trigger_restart_min_framework", - "cmds" : [ - ] - }, { - "name" : "param:vold.decrypt=trigger_restart_framework", - "condition" : "vold.decrypt=trigger_restart_framework", - "cmds" : [ - "setparam service.bootanim.exit 0", - "start bootanim" - ] - }, { - "name" : "param:vold.decrypt=trigger_shutdown_framework", - "condition" : "vold.decrypt=trigger_shutdown_framework", - "cmds" : [ - ] - }, { - "name" : "param:sys.boot_completed=1", - "condition" : "sys.boot_completed=1", - "cmds" : [ - ] }, { "name" : "param:sys.sysctl.extra_free_kbytes=*", "condition" : "sys.sysctl.extra_free_kbytes=*", @@ -564,10 +481,6 @@ "console" : 1, "uid" : "root", "gid" : ["shell", "log", "readproc"] - }, { - "name" : "flash_recovery", - "path" : ["/system/bin/install-recovery.sh"], - "once" : 1 } ] } diff --git a/services/etc/ohos.para b/services/etc/ohos.para new file mode 100755 index 000000000..31aaf40ca --- /dev/null +++ b/services/etc/ohos.para @@ -0,0 +1,36 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +build_version = 2.0 + +# whether ohos is enabled. +hw_sc.build.os.enable=true + +# ohos API version number. +hw_sc.build.os.apiversion=6 + +# ohos system version. +hw_sc.build.os.version=2.2.0 + +# ohos device type please use hw_sc.build.os.devicetype + +# ohos release type +hw_sc.build.os.releasetype=Canary1 + +ro.actionable_compatible_property.enabled=false +ro.postinstall.fstab.prefix=/system +ro.secure=1 +security.perf_harden=1 +ro.allow.mock.location=0 +ro.debuggable=1 +persist.sys.usb.config=hdc diff --git a/services/src/init_read_cfg.c b/services/src/init_read_cfg.c index 751a02a6c..336820ea1 100644 --- a/services/src/init_read_cfg.c +++ b/services/src/init_read_cfg.c @@ -125,10 +125,7 @@ void InitReadCfg() { #ifndef OHOS_LITE InitParamService(); - LoadDefaultParams("/system/etc/prop.default"); - LoadDefaultParams("/system/build.prop"); - LoadDefaultParams("/system/buildz.prop"); - LoadDefaultParams("/product/build.prop"); + LoadDefaultParams("/system/etc/ohos.para"); #endif ParseInitCfg(INIT_CONFIGURATION_FILE); ParseOtherCfgs(); -- Gitee