• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff --git a/services/etc/init.without_two_stages.cfg b/services/etc/init.without_two_stages.cfg
2index 84166bfd..d65816a2 100755
3--- a/services/etc/init.without_two_stages.cfg
4+++ b/services/etc/init.without_two_stages.cfg
5@@ -9,14 +9,19 @@
6             "cmds" : [
7                 "write /proc/sys/kernel/sysrq 0",
8                 "start ueventd",
9-                "start watchdog_service",
10                 "mkdir /data",
11                 "mount_fstab /vendor/etc/fstab.${ohos.boot.hardware}",
12+                "restorecon /data",
13                 "chown system system /data",
14                 "chmod 0771 /data",
15                 "mkdir /data/service 0711 root root",
16                 "mkdir /data/service/el0 0711 root root",
17-                "load_persist_params "
18+                "mount configfs none /config nodev noexec nosuid",
19+                "load_persist_params ",
20+                "mkdir /data/bootchart 0755 root root",
21+                "bootchart start",
22+                "chown access_token access_token /dev/access_token_id",
23+                "chmod 0666 /dev/access_token_id"
24             ]
25         }, {
26             "name" : "init",
27@@ -59,11 +64,14 @@
28                 "chown system system /sys/power/state",
29                 "chown system system /sys/power/wakeup_count",
30                 "chmod 0660 /sys/power/state",
31+                "mount pstore pstore /sys/fs/pstore nodev noexec nosuid",
32+                "chown system log /sys/fs/pstore",
33+                "chmod 0555 /sys/fs/pstore",
34                 "ifup lo",
35                 "hostname localhost",
36                 "domainname localdomain"
37             ]
38-        },  {
39+        }, {
40             "name" : "post-init",
41             "cmds" : [
42                 "trigger early-fs",
43@@ -105,6 +113,7 @@
44                 "mkdir /data/app/el4 0711 root root",
45                 "mkdir /data/service/el1 0711 root root",
46                 "mkdir /data/service/el1/public 0711 root root",
47+                "mkdir /data/service/el1/public/AbilityManagerService 0711 system system",
48                 "mkdir /data/service/el2 0711 root root",
49                 "mkdir /data/chipset 0711 root root",
50                 "mkdir /data/chipset/el1 0711 root root",
51@@ -121,46 +130,23 @@
52                 "mkdir /data/app/el3/0/base 0711 root root",
53                 "mkdir /data/app/el4/0 0711 root root",
54                 "mkdir /data/app/el4/0/base 0711 root root",
55-                "mkdir /data/service/el1/0 0711 root root",
56                 "mkdir /data/service/el2/0 0711 root root",
57                 "mkdir /data/service/el2/0/hmdfs 0711 system system",
58-                "mkdir /data/chipset/el1/0 0711 root root",
59                 "mkdir /data/chipset/el2/0 0711 root root",
60-                "mkdir /data/bootchart 0755 shell shell",
61+                "mkdir /storage/media 0711 root root",
62                 "mkdir /data/app-staging 0750 system system",
63                 "copy /data/system/entropy.dat /dev/urandom",
64                 "mkdir /data/misc 01771 system misc",
65                 "mkdir /data/local 0751 root root",
66-                "mkdir /data/preloads 0775 system system",
67                 "mkdir /data/vendor 0771 root root",
68-                "mkdir /data/vendor_ce 0771 root root",
69-                "mkdir /data/vendor_de 0771 root root",
70-                "mkdir /data/vendor/hardware 0771 root root",
71                 "mkdir /data/local/tmp 0771 shell shell",
72                 "mkdir /data/local/traces 0777 shell shell",
73                 "mkdir /data/data 0771 system system",
74-                "mkdir /data/app-private 0771 system system",
75-                "mkdir /data/app-ephemeral 0771 system system",
76-                "mkdir /data/app-asec 0700 root root",
77-                "mkdir /data/app-lib 0771 system system",
78                 "mkdir /data/app 0771 system system",
79-                "mkdir /data/ota 0771 root root",
80-                "mkdir /data/ota_package 0770 update update",
81-                "chown update update /data/ota_package",
82-                "chmod 0770 /data/ota_package",
83-                "mkdir /data/resource-cache 0771 system system",
84-                "chown system system /data/resource-cache",
85-                "chmod 0771 /data/resource-cache",
86-                "mkdir /data/lost+found 0770 root root",
87-                "mkdir /data/drm 0770 drm drm",
88-                "mkdir /data/mediadrm 0770 mediadrm mediadrm",
89                 "mkdir /data/nfc 0770 nfc nfc",
90                 "mkdir /data/nfc/param 0770 nfc nfc",
91-                "mkdir /data/backup 0700 system system",
92-                "mkdir /data/ss 0700 system system",
93                 "mkdir /data/system 0775 system system",
94                 "mkdir /data/system/dropbox 0700 system system",
95-                "mkdir /data/system/heapdump 0700 system system",
96                 "mkdir /data/system_de 0770 system system",
97                 "mkdir /data/system_ce 0770 system system",
98                 "mkdir /data/misc_de 01771 system misc",
99@@ -168,12 +154,6 @@
100                 "mkdir /data/user 0711 system system",
101                 "mkdir /data/user_de 0711 system system",
102                 "symlink /data/data /data/user/0",
103-                "mkdir /data/media 0770 media_rw media_rw",
104-                "mkdir /data/media/obb 0770 media_rw media_rw",
105-                "mkdir /data/cache 0770 system cache",
106-                "mkdir /data/cache/recovery 0770 system cache",
107-                "mkdir /data/cache/backup_stage 0700 system system",
108-                "mkdir /data/cache/backup 0700 system system",
109                 "setparam sys.use_memfd false",
110                 "chown root system /dev/fscklogs/log",
111                 "chmod 0770 /dev/fscklogs/log",
112@@ -182,6 +162,9 @@
113         }, {
114             "name" : "boot",
115             "cmds" : [
116+                "write /sys/block/zram0/disksize 1024M",
117+                "mkswap /dev/block/zram0",
118+                "swapon /dev/block/zram0",
119                 "write /proc/sys/net/core/xfrm_acq_expires 3600",
120                 "write /proc/sys/vm/overcommit_memory 1",
121                 "write /proc/sys/vm/min_free_order_shift 4",
122@@ -189,8 +172,6 @@
123                 "chmod 0664 /sys/block/zram0/idle",
124                 "write /proc/sys/vm/dirty_expire_centisecs 200",
125                 "write /proc/sys/vm/dirty_background_ratio 5",
126-                "chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
127-                "chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
128                 "chown system system /sys/class/leds/red/brightness",
129                 "chown system system /sys/class/leds/green/brightness",
130                 "chown system system /sys/class/leds/blue/brightness",
131@@ -225,65 +206,11 @@
132                 "write /proc/sys/kernel/perf_event_paranoid 3"
133             ]
134         }, {
135-            "name" : "boot && param:const.debuggable=1",
136-            "condition" : "boot && const.debuggable=1",
137+            "name" : "services:console",
138             "cmds" : [
139                 "chmod 0773 /data/misc/trace",
140-                "chmod 0775 /data/misc/wmtrace",
141-                "start console"
142-            ]
143-        }, {
144-            "name" : "reboot",
145-            "cmds" : [
146-                "stopAllServices ",
147-                "sync ",
148-                "umount /vendor",
149-                "umount /data MNT_FORCE",
150-                "sync "
151+                "chmod 0775 /data/misc/wmtrace"
152             ]
153-       }
154-    ],
155-    "services" : [{
156-            "name" : "ueventd",
157-            "path" : ["/system/bin/ueventd"],
158-            "socket" : [{
159-                "name" : "ueventd",
160-                "family" : "AF_NETLINK",
161-                "type" : "SOCK_DGRAM",
162-                "protocol" : "NETLINK_KOBJECT_UEVENT",
163-                "permissions" : "0660",
164-                "uid" : "system",
165-                "gid" : "system",
166-                "option" : [
167-                    "SOCKET_OPTION_PASSCRED",
168-                    "SOCKET_OPTION_RCVBUFFORCE",
169-                    "SOCK_CLOEXEC",
170-                    "SOCK_NONBLOCK"
171-                ]
172-            }],
173-            "critical" : [ 0, 15, 5],
174-            "ondemand" : true,
175-            "sandbox" : 0,
176-            "start-mode" : "condition"
177-        }, {
178-            "name" : "console",
179-            "path" : ["/system/bin/sh"],
180-            "disabled" : 1,
181-            "console" : 1,
182-            "uid" : "root",
183-            "gid" : ["shell", "log", "readproc"],
184-            "start-mode" : "condition"
185-        }, {
186-            "name" : "watchdog_service",
187-            "path" : ["/system/bin/watchdog_service", "10", "20"],
188-            "disabled" : 1,
189-            "uid" : "watchdog",
190-            "gid" : ["watchdog", "log", "readproc"],
191-            "start-mode" : "condition"
192-        }, {
193-            "name" : "misc",
194-            "path" : ["/system/bin/misc_daemon", "--write_logo", "/vendor/logo.rgb"],
195-            "once" : 1
196         }
197     ]
198 }
199diff --git a/ueventd/etc/ueventd.config b/ueventd/etc/ueventd.config
200index 094a766a..34a38566 100755
201--- a/ueventd/etc/ueventd.config
202+++ b/ueventd/etc/ueventd.config
203@@ -65,6 +65,7 @@
204 /dev/dri/card0-DSI-1 0666 0 1003
205 /dev/dri/card0-HDMI-A-1 0666 0 1003
206 /dev/dri/renderD128 0666 0 1003
207+/dev/dri/card1 0666 0 1003
208 /dev/rtc0 0640 3819 3819
209 /dev/tty0 0660 0 1000
210 /dev/uinput 0660 3011 3011
211