未验证 提交 327b651c 编写于 作者: O openharmony_ci 提交者: Gitee

!522 fix: disassemble service from init.cfg

Merge pull request !522 from 熊磊/0415xyttwocfgs
......@@ -233,6 +233,30 @@ if (defined(ohos_lite)) {
part_name = "init"
}
ohos_prebuilt_etc("misc.cfg") {
source = "//base/startup/init_lite/services/etc/misc.cfg"
relative_install_dir = "init"
part_name = "init"
}
ohos_prebuilt_etc("watchdog.cfg") {
source = "//base/startup/init_lite/services/etc/watchdog.cfg"
relative_install_dir = "init"
part_name = "init"
}
ohos_prebuilt_etc("console.cfg") {
source = "//base/startup/init_lite/services/etc/console.cfg"
relative_install_dir = "init"
part_name = "init"
}
ohos_prebuilt_etc("ueventd.cfg") {
source = "//base/startup/init_lite/services/etc/ueventd.cfg"
relative_install_dir = "init"
part_name = "init"
}
ohos_prebuilt_etc("passwd") {
source = "//base/startup/init_lite/services/etc/passwd"
install_images = [
......@@ -363,11 +387,13 @@ if (defined(ohos_lite)) {
":boot.group",
":charing.group",
":chipset-sandbox.json",
":console.cfg",
":group",
":init.cfg",
":init.reboot",
":init.usb.cfg",
":init.usb.configfs.cfg",
":misc.cfg",
":ohos.para",
":ohos.para.dac",
":ohos_const.para",
......@@ -378,6 +404,8 @@ if (defined(ohos_lite)) {
":syscap.para",
":system-sandbox.json",
":systemcapability.json",
":ueventd.cfg",
":watchdog.cfg",
]
}
}
{
"services" : [{
"name" : "console",
"path" : ["/system/bin/sh"],
"start-mode" : "condition",
"disabled" : 1,
"console" : 1,
"sandbox" : 0,
"uid" : "root",
"gid" : ["shell", "log", "readproc"],
"jobs" : {
"on-start" : "services:console"
}
}
]
}
......@@ -249,53 +249,5 @@
"chmod 0775 /data/misc/wmtrace"
]
}
],
"services" : [{
"name" : "ueventd",
"path" : ["/system/bin/ueventd"],
"socket" : [{
"name" : "ueventd",
"family" : "AF_NETLINK",
"type" : "SOCK_DGRAM",
"protocol" : "NETLINK_KOBJECT_UEVENT",
"permissions" : "0660",
"uid" : "system",
"gid" : "system",
"option" : [
"SOCKET_OPTION_PASSCRED",
"SOCKET_OPTION_RCVBUFFORCE",
"SOCK_CLOEXEC",
"SOCK_NONBLOCK"
]
}],
"critical" : [ 0, 15, 5],
"ondemand" : true,
"sandbox" : 0,
"start-mode" : "condition"
}, {
"name" : "console",
"path" : ["/system/bin/sh"],
"start-mode" : "condition",
"disabled" : 1,
"console" : 1,
"sandbox" : 0,
"uid" : "root",
"gid" : ["shell", "log", "readproc"],
"jobs" : {
"on-start" : "services:console"
}
}, {
"name" : "watchdog_service",
"start-mode" : "condition",
"path" : ["/system/bin/watchdog_service", "10", "2"],
"disabled" : 1,
"sandbox" : 0,
"uid" : "root",
"gid" : ["shell", "log", "readproc"]
}, {
"name" : "misc",
"path" : ["/system/bin/misc_daemon", "--write_logo", "/vendor/logo.rgb"],
"once" : 1
}
]
}
......@@ -8,11 +8,6 @@
"name" : "pre-init",
"cmds" : [
"write /proc/sys/kernel/sysrq 0",
"mkdir /acct/uid",
"chown root system /dev/memcg/memory.pressure_level",
"chmod 0040 /dev/memcg/memory.pressure_level",
"mkdir /dev/memcg/apps/ 0755 system system",
"mkdir /dev/memcg/system 0550 system system",
"start ueventd",
"start watchdog_service",
"mkdir /data",
......@@ -31,40 +26,6 @@
"symlink /proc/self/fd/0 /dev/stdin",
"symlink /proc/self/fd/1 /dev/stdout",
"symlink /proc/self/fd/2 /dev/stderr",
"symlink /sys/kernel/debug /d",
"mkdir /dev/stune/foreground",
"mkdir /dev/stune/background",
"mkdir /dev/stune/top-app",
"mkdir /dev/stune/rt",
"chown system system /dev/stune",
"chown system system /dev/stune/foreground",
"chown system system /dev/stune/background",
"chown system system /dev/stune/top-app",
"chown system system /dev/stune/rt",
"chown system system /dev/stune/tasks",
"chown system system /dev/stune/foreground/tasks",
"chown system system /dev/stune/background/tasks",
"chown system system /dev/stune/top-app/tasks",
"chown system system /dev/stune/rt/tasks",
"chmod 0664 /dev/stune/tasks",
"chmod 0664 /dev/stune/foreground/tasks",
"chmod 0664 /dev/stune/background/tasks",
"chmod 0664 /dev/stune/top-app/tasks",
"chmod 0664 /dev/stune/rt/tasks",
"mkdir /dev/blkio/background",
"chown system system /dev/blkio",
"chown system system /dev/blkio/background",
"chown system system /dev/blkio/tasks",
"chown system system /dev/blkio/background/tasks",
"chmod 0664 /dev/blkio/tasks",
"chmod 0664 /dev/blkio/background/tasks",
"write /dev/blkio/blkio.weight 1000",
"write /dev/blkio/background/blkio.weight 500",
"write /dev/blkio/blkio.group_idle 0",
"write /dev/blkio/background/blkio.group_idle 0",
"chmod 0770 /config/sdcardfs",
"chown system package_info /config/sdcardfs",
"symlink /storage/self/primary /sdcard",
"write /proc/sys/kernel/panic_on_oops 1",
"write /proc/sys/kernel/hung_task_timeout_secs 0",
"write /proc/cpu/alignment 4",
......@@ -86,53 +47,8 @@
"write /proc/sys/net/ipv4/conf/all/accept_redirects 0",
"write /proc/sys/net/ipv6/conf/all/accept_redirects 0",
"chmod 0400 /proc/net/fib_trie",
"chown system system /dev/cpuctl",
"chown system system /dev/cpuctl/tasks",
"chmod 0666 /dev/cpuctl/tasks",
"write /dev/cpuctl/cpu.rt_period_us 1000000",
"write /dev/cpuctl/cpu.rt_runtime_us 950000",
"mkdir /dev/cpuset/foreground",
"copy /dev/cpuset/cpus /dev/cpuset/foreground/cpus",
"copy /dev/cpuset/mems /dev/cpuset/foreground/mems",
"mkdir /dev/cpuset/background",
"copy /dev/cpuset/cpus /dev/cpuset/background/cpus",
"copy /dev/cpuset/mems /dev/cpuset/background/mems",
"mkdir /dev/cpuset/system-background",
"copy /dev/cpuset/cpus /dev/cpuset/system-background/cpus",
"copy /dev/cpuset/mems /dev/cpuset/system-background/mems",
"mkdir /dev/cpuset/restricted",
"copy /dev/cpuset/cpus /dev/cpuset/restricted/cpus",
"copy /dev/cpuset/mems /dev/cpuset/restricted/mems",
"mkdir /dev/cpuset/top-app",
"copy /dev/cpuset/cpus /dev/cpuset/top-app/cpus",
"copy /dev/cpuset/mems /dev/cpuset/top-app/mems",
"chown system system /dev/cpuset",
"chown system system /dev/cpuset/foreground",
"chown system system /dev/cpuset/background",
"chown system system /dev/cpuset/system-background",
"chown system system /dev/cpuset/top-app",
"chown system system /dev/cpuset/restricted",
"chown system system /dev/cpuset/tasks",
"chown system system /dev/cpuset/foreground/tasks",
"chown system system /dev/cpuset/background/tasks",
"chown system system /dev/cpuset/system-background/tasks",
"chown system system /dev/cpuset/top-app/tasks",
"chown system system /dev/cpuset/restricted/tasks",
"chmod 0775 /dev/cpuset/system-background",
"chmod 0664 /dev/cpuset/foreground/tasks",
"chmod 0664 /dev/cpuset/background/tasks",
"chmod 0664 /dev/cpuset/system-background/tasks",
"chmod 0664 /dev/cpuset/top-app/tasks",
"chmod 0664 /dev/cpuset/restricted/tasks",
"chmod 0664 /dev/cpuset/tasks",
"chown system system /proc/pressure/memory",
"chmod 0664 /proc/pressure/memory",
"chown root net_bw_acct /proc/net/xt_qtaguid/ctrl",
"chown root net_bw_stats /proc/net/xt_qtaguid/stats",
"chmod 0644 /dev/xt_qtaguid",
"chown root root /dev/cg2_bpf",
"chmod 0600 /dev/cg2_bpf",
"mount bpf bpf /sys/fs/bpf nodev noexec nosuid",
"mkdir /dev/fscklogs 0770 root system",
"write /proc/sys/abi/swp 1",
"symlink /proc/self/fd /dev/fd",
......@@ -159,11 +75,6 @@
"trigger early-boot",
"trigger boot"
]
}, {
"name" : "early-fs",
"cmds" : [
"start vold"
]
}, {
"name" : "post-fs",
"cmds" : [
......@@ -217,48 +128,11 @@
"mkdir /data/app-staging 0750 system system",
"copy /data/system/entropy.dat /dev/urandom",
"mkdir /data/misc 01771 system misc",
"mkdir /data/misc/bluedroid 02770 bluetooth bluetooth",
"chmod 0660 /data/misc/bluedroid/bt_config.conf",
"chown bluetooth bluetooth /data/misc/bluedroid/bt_config.conf",
"mkdir /data/misc/bluetooth 0770 bluetooth bluetooth",
"mkdir /data/misc/bluetooth/logs 0770 bluetooth bluetooth",
"mkdir /data/misc/keystore 0700 keystore keystore",
"mkdir /data/misc/gatekeeper 0700 system system",
"mkdir /data/misc/keychain 0771 system system",
"mkdir /data/misc/net 0750 root shell",
"mkdir /data/misc/radio 0770 system radio",
"mkdir /data/misc/sms 0770 system radio",
"mkdir /data/misc/carrierid 0770 system radio",
"mkdir /data/misc/apns 0770 system radio",
"mkdir /data/misc/zoneinfo 0775 system system",
"mkdir /data/misc/network_watchlist 0774 system system",
"mkdir /data/misc/textclassifier 0771 system system",
"mkdir /data/misc/vpn 0770 system vpn",
"mkdir /data/misc/shared_relro 0771 shared_relro shared_relro",
"mkdir /data/misc/systemkeys 0700 system system",
"mkdir /data/misc/wifi 0770 wifi wifi",
"mkdir /data/misc/wifi/sockets 0770 wifi wifi",
"mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi",
"mkdir /data/misc/ethernet 0770 system system",
"mkdir /data/misc/dhcp 0770 dhcp dhcp",
"mkdir /data/misc/user 0771 root root",
"mkdir /data/misc/perfprofd 0775 root root",
"chmod 0660 /data/misc/wifi/wpa_supplicant.conf",
"mkdir /data/local 0751 root root",
"mkdir /data/misc/media 0700 media media",
"mkdir /data/misc/audio 0700 audio audio",
"mkdir /data/misc/cameraserver 0700 cameraserver cameraserver",
"mkdir /data/misc/vold 0700 root root",
"mkdir /data/misc/boottrace 0771 system shell",
"mkdir /data/misc/update_engine 0700 root root",
"mkdir /data/misc/update_engine_log 02750 root log",
"mkdir /data/misc/trace 0700 root root",
"mkdir /data/misc/wmtrace 0700 system system",
"mkdir /data/misc/profiles 0771 system system",
"mkdir /data/misc/profiles/cur 0771 system system",
"mkdir /data/misc/profiles/ref 0771 system system",
"mkdir /data/misc/profman 0770 system shell",
"mkdir /data/misc/gcov 0770 root root",
"mkdir /data/preloads 0775 system system",
"mkdir /data/vendor 0771 root root",
"mkdir /data/vendor_ce 0771 root root",
......@@ -313,70 +187,15 @@
"write /proc/sys/net/core/xfrm_acq_expires 3600",
"write /proc/sys/vm/overcommit_memory 1",
"write /proc/sys/vm/min_free_order_shift 4",
"chown root system /sys/module/lowmemorykiller/parameters/adj",
"chmod 0664 /sys/module/lowmemorykiller/parameters/adj",
"chown root system /sys/module/lowmemorykiller/parameters/minfree",
"chmod 0664 /sys/module/lowmemorykiller/parameters/minfree",
"chown root system /sys/block/zram0/idle",
"chmod 0664 /sys/block/zram0/idle",
"chown root system /sys/block/zram0/writeback",
"chmod 0664 /sys/block/zram0/writeback",
"write /proc/sys/vm/dirty_expire_centisecs 200",
"write /proc/sys/vm/dirty_background_ratio 5",
"write /sys/fs/f2fs/${dev.mnt.blk.data}/cp_interval 200",
"chown system system /sys/power/autosleep",
"chown radio wakelock /sys/power/wake_lock",
"chown radio wakelock /sys/power/wake_unlock",
"chmod 0660 /sys/power/wake_lock",
"chmod 0660 /sys/power/wake_unlock",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/timer_rate",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/timer_rate",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/timer_slack",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/timer_slack",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/min_sample_time",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/target_loads",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/target_loads",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/boost",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boost",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/input_boost",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/input_boost",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration",
"chown system system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy",
"chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/io_is_busy",
"chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
"chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
"chown system system /sys/class/leds/vibrator/trigger",
"chown system system /sys/class/leds/vibrator/activate",
"chown system system /sys/class/leds/vibrator/brightness",
"chown system system /sys/class/leds/vibrator/duration",
"chown system system /sys/class/leds/vibrator/state",
"chown system system /sys/class/timed_output/vibrator/enable",
"chown system system /sys/class/leds/keyboard-backlight/brightness",
"chown system system /sys/class/leds/lcd-backlight/brightness",
"chown system system /sys/class/leds/button-backlight/brightness",
"chown system system /sys/class/leds/jogball-backlight/brightness",
"chown system system /sys/class/leds/red/brightness",
"chown system system /sys/class/leds/green/brightness",
"chown system system /sys/class/leds/blue/brightness",
"chown system system /sys/class/leds/red/device/grpfreq",
"chown system system /sys/class/leds/red/device/grppwm",
"chown system system /sys/class/leds/red/device/blink",
"chown system system /sys/module/sco/parameters/disable_esco",
"chown system system /sys/kernel/ipv4/tcp_wmem_min",
"chown system system /sys/kernel/ipv4/tcp_wmem_def",
"chown system system /sys/kernel/ipv4/tcp_wmem_max",
"chown system system /sys/kernel/ipv4/tcp_rmem_min",
"chown system system /sys/kernel/ipv4/tcp_rmem_def",
"chown system system /sys/kernel/ipv4/tcp_rmem_max",
"chown root radio /proc/cmdline",
"setparam net.tcp.default_init_rwnd 60"
]
......
{
"services" : [{
"name" : "misc",
"path" : ["/system/bin/misc_daemon", "--write_logo", "/vendor/logo.rgb"],
"once" : 1
}
]
}
{
"services" : [{
"name" : "ueventd",
"path" : ["/system/bin/ueventd"],
"socket" : [{
"name" : "ueventd",
"family" : "AF_NETLINK",
"type" : "SOCK_DGRAM",
"protocol" : "NETLINK_KOBJECT_UEVENT",
"permissions" : "0660",
"uid" : "system",
"gid" : "system",
"option" : [
"SOCKET_OPTION_PASSCRED",
"SOCKET_OPTION_RCVBUFFORCE",
"SOCK_CLOEXEC",
"SOCK_NONBLOCK"
]
}],
"critical" : [ 0, 15, 5],
"ondemand" : true,
"sandbox" : 0,
"start-mode" : "condition"
}
]
}
{
"services" : [{
"name" : "watchdog_service",
"start-mode" : "condition",
"path" : ["/system/bin/watchdog_service", "10", "2"],
"disabled" : 1,
"sandbox" : 0,
"uid" : "root",
"gid" : ["shell", "log", "readproc"]
}
]
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册