Commit graph

975 commits

Author SHA1 Message Date
Wei Wang
8c1e3292a8 Merge "init.rc: make sure netd start after post-fs-data" am: f58280e7dc am: 449b59873f
am: 07ace62093

Change-Id: I68103aafa9a23e0bf177d91544e4fbd743d222e4
2017-03-09 23:56:30 +00:00
Wei Wang
bae9ba3402 init.rc: make sure netd start after post-fs-data
Current init doesn't order the triggeres it scaned, and there is no
guarantee that general event trigger exec first and then event+property
triggers.

This CL will make sure netd started after post-fs-data trigger is done.

Bug: 35110957
Test: marlin boots
Change-Id: I7bb55af4e00f336682388abfa8a06eac2136b7d4
2017-03-09 13:53:39 -08:00
Wei Wang
36baabf07b Merge "init.rc: start netd and zygote early for file based encryption devices" am: 4bf2bc078f am: 1a65e43878
am: 3b272c7bf8

Change-Id: Ie44f4fd8a04b1fa1d0a5c6f7e01410246589c9d9
2017-03-09 06:24:27 +00:00
Wei Wang
7f32aa4d04 init.rc: start netd and zygote early for file based encryption devices
Bug: 35110957
Test: marlin boots
Change-Id: Ibe4c413e41fcf25a68b50d99ee66d9b70706a6a1
2017-03-08 14:48:53 -08:00
Wei Wang
43a356d213 Merge "init.rc: add a new zygote-start trigger" am: 4e5e797d26 am: 0d9416ba2e
am: 2980bc1139

Change-Id: I56e6907db4063f6b527be710b00de9200aa8914a
2017-03-08 22:28:24 +00:00
Treehugger Robot
4e5e797d26 Merge "init.rc: add a new zygote-start trigger" 2017-03-08 22:18:11 +00:00
Wei Wang
a2058036ed init.rc: add a new zygote-start trigger
Bug: 35110957
Test: marlin boots
Change-Id: I12b41588371486e79938df2f7a2152cda18530d1
2017-03-08 12:39:41 -08:00
David Lin
ae31fd48b0 Merge "init.rc: remove duplicated chown entry for timed_output" am: e88882e16e am: 9c23fcbcd9
am: 197b3f736c

Change-Id: I4a87933290c31305b03fbcaa5c719503d8928b32
2017-03-08 18:50:09 +00:00
David Lin
489450abe3 init.rc: remove duplicated chown entry for timed_output
Test: build

Change-Id: Ib15be4188cdce270a15bd90304be0704d9e54cbf
Signed-off-by: David Lin <dtwlin@google.com>
2017-03-07 21:31:42 -08:00
Ryan Campbell
a4f5d12b71 Merge "Add global GCOV_PREFIX option." am: df0f792a9e am: 2d3378350a
am: 11339c7e34

Change-Id: I10d53220ea5e433ae0f027bf21750a239a588e9c
2017-02-28 23:37:10 +00:00
Ryan Campbell
0b36473272 Add global GCOV_PREFIX option.
When native coverage is enabled, add a global GCOV_PREFIX
environment variable specifying that gcda files be output
with path prefix /data/local/tmp.

Bug: 35635587
Test: make NATIVE_COVERAGE=true; check init.environ.rc
Change-Id: I40972aea3ca3168d0687bdc93e9d4b7b3a1071b9
2017-02-27 15:00:18 -08:00
Todd Poynor
1cf50050e6 Merge "init.rc: create /data/misc/reboot for storing reboot reason" am: e499403bf4 am: 4dbefe4d4c am: 23b31ba7e3
am: 0561551951

Change-Id: I5ea693f7f34903305e34391fcd7d7a7174c2ffd8
2017-02-10 21:43:22 +00:00
Todd Poynor
44ee2b0ef8 init.rc: create /data/misc/reboot for storing reboot reason
Create /data/misc/reboot if not already.

Bug: 30994946
Test: manual: reboot command; modified thermal-engine.conf
Change-Id: I66418beba539f76759b44742af7700f26a2c1f87
2017-02-10 19:26:13 +00:00
Steven Moreland
314bb2faf2 Merge "init.rc, typo: fs-post-data -> post-fs-data" am: 5b202c4376 am: e0ac5d8304 am: 311e4295dc
am: 06e9f5de8c

Change-Id: I1525db8d43c3c27fe7ae1b17dd97a99f28321c13
2017-01-26 00:58:46 +00:00
Steven Moreland
f38aab4621 init.rc, typo: fs-post-data -> post-fs-data
Test: pass
Change-Id: Icafdb7ec61935b35db85096b49e7f232a456f620
2017-01-25 10:52:40 -08:00
Josh Gao
5150a8fb85 Actually don't start tombstoned until /data is mounted. am: 0ad5107e51 am: 1170d8201d am: bf8bd27bb3
am: 32d18e2204

Change-Id: I45fe22d5b83e6399aadc374976986e7f660d9eba
2017-01-24 02:51:34 +00:00
Josh Gao
0ad5107e51 Actually don't start tombstoned until /data is mounted.
Bug: http://b/34461270
Test: boot is actually faster
Test: tombstoned still started by init
Change-Id: I4976abef108bbb6fad264f9b68cbc1fba711085b
2017-01-23 16:01:14 -08:00
Josh Gao
8c98938853 Merge "init: don't start tombstoned until /data is mounted." am: b479a5002e am: f83489c02c am: d7db8378d0
am: 5d6ea5a9bd

Change-Id: I5ad79b54f9f42e6b04d81ca8123e5b41b03e92fb
2017-01-20 22:27:44 +00:00
Treehugger Robot
b479a5002e Merge "init: don't start tombstoned until /data is mounted." 2017-01-20 22:13:38 +00:00
Josh Gao
42a0fed78b init: don't start tombstoned until /data is mounted.
When vold mounts the encrypted /data partition, it first checks for and
kills processes that have open fds to the tmpfs placeholder at /data.
This resulted in a 20 second boot-time regression (vold's timeout period)
when tombstoned was started before vold.

Bug: http://b/34461270
Test: boot is faster, no messages from vold in console spew
Test: tombstoned still started by init
Change-Id: Ib5e9ddb05f40c9da852f00e103861c6ff2d94888
2017-01-20 13:18:51 -08:00
Dave Weinstein
4b499a1b13 Merge "Move the kptr_restrict setting from init.rc to init.cpp." am: c734a0a9ee am: 776978788b am: 7e79a571fd
am: a69b7ea3a4

Change-Id: Iabde07f1c50e62b5394386f5718ae5a3d40e7c3b
2017-01-20 20:34:40 +00:00
Dave Weinstein
44f7e4f421 Move the kptr_restrict setting from init.rc to init.cpp.
Also ensure that it uses the highest supported value, and
abort if the value is not above a minimum threshold.

Test: Tested against the curent kernel (maximum value of 2,
      set to 0 by the kernel initially) and against a
      modified kernel (maximum value of 4, set to 4 by the
      kernel initially)

Bug: 30368199
Change-Id: I608db577258b68b390ffe96f452e1f7c0bc9ad8a
2017-01-20 09:40:43 -08:00
Paul Lawrence
8cf0eba307 Merge "Set right attributes on tracing folder" am: 5d8bf9e6e2 am: f014e41731 am: 36eeceec84
am: 87b62dc44c

Change-Id: Ie1eeaf4d1e0dc63c80262376720abe96684a2590
2017-01-12 01:52:03 +00:00
Paul Lawrence
3d8ade3f24 Set right attributes on tracing folder
Since splitting tracefs out from debugfs, we now need to set the
attributes explicitly on tracing folder.

Test: Run adb shell atrace -c -b 16000 -t 5 gfx
Bug: 34197733
Change-Id: If2a962332b6d1ec227e289bdf952213756e26186
2017-01-11 15:51:25 -08:00
Elliott Hughes
b0aea04065 Merge "Improve init bootcharting." am: 4ee7861ee1 am: a6532b4717 am: 1a947725b8
am: 352b9c6282

Change-Id: I58b258cbf13bdcc874bcce35d4bb07378a8a1864
2016-12-16 18:03:12 +00:00
Elliott Hughes
4ee7861ee1 Merge "Improve init bootcharting." 2016-12-16 17:32:27 +00:00
Sandeep Patil
9b2e207099 Merge "socket: uevent: use SO_RCVBUF instead of SO_RCVBUFFORCE" am: 0a2080bced am: 571e246983 am: c345388bea
am: e432dc58c1

Change-Id: Iab5bafe3e156dfb2fc75634c8d25b5f67991915e
2016-12-14 19:54:35 +00:00
Sandeep Patil
5fee496e62 socket: uevent: use SO_RCVBUF instead of SO_RCVBUFFORCE
The SO_RCVBUFFORCE option requires the caller of uevent_create_socket()
to have net_admin capabilities.

Set platform default rcv/snd buffer sizes to 256kb that will always be
overridden by the device/target. However, it will allow
ueventd / healthd to use the uevent_create_socket() API w/o requiring
the net_admin capability.

Note: All devices override the buffer sizes according to the technology
maximum to at least ~8MB. So, the init.rc change here is to make sure
platform code can work w/o any overrides.

Test: no SELinux failures for healthd with 'net_admin' removed.

Bug: https://b/32733887

Change-Id: Ida346468cd550ad07901bf3a78ad508939849906
Signed-off-by: Sandeep Patil <sspatil@google.com>
2016-12-09 15:16:28 -08:00
Elliott Hughes
a3641af22f Improve init bootcharting.
Most notably, there's no longer any need to guess an end time.

Bug: http://b/23478578
Bug: http://b/33450491
Test: rebooted with bootcharting on/off
Change-Id: Icb7d6859581da5526d77dfc5aa4d57c9bfbfd7e2
2016-12-08 17:35:45 -08:00
Nick Kralevich
107b8ec454 Merge "change /data/bugreports to /bugreports" am: 1b2e6abf3b am: 5fae86b5fa am: cb9fbb4cf6
am: c3f9d38a4c

Change-Id: Ie10d1db864543ad6cc8695267344453599408c52
2016-11-23 00:19:04 +00:00
Nick Kralevich
5fae86b5fa Merge "change /data/bugreports to /bugreports"
am: 1b2e6abf3b

Change-Id: I7de15de91a688f8fe4a203a84b54e7dcfa106782
2016-11-23 00:11:13 +00:00
Nick Kralevich
c4084c6694 change /data/bugreports to /bugreports
It's 5 characters shorter, has no runtime costs, can be stored on a
read-only partition, and avoids problems like b/27262109 and b/27204904.
It allows makes some security hardening easier.

Bug: 27262109
Bug: 27204904
Bug: 32799236
Test: verified new symlink created and old one not present
Change-Id: Ief362e13569ad9c868a7f0f9c4dbd6a328c96c6b
2016-11-22 08:57:25 -08:00
Nick Kralevich
8e22b4b9ec init.rc: delete extra whitespace am: 715e33452e am: 70056e91fe
am: 6bef57560f

Change-Id: I8379eecc012dafb16e037e7fae8386df6b677303
2016-11-20 01:11:05 +00:00
Nick Kralevich
715e33452e init.rc: delete extra whitespace
causes merge conflicts.

Test: none
Change-Id: Ic83db2b3e2f972955efadfc8df8fe8ec918a7609
2016-11-19 16:07:40 -08:00
Paul Lawrence
0705fcb2f4 Merge "Add flags to restorecon_recursive to traverse filesystems" am: 5fbd1cfd34 am: ffa3689107 am: a99490c813
am: e799e3317a

Change-Id: Icd4b867d450c7b84f86f9d91b39faf6792544cb1
2016-11-17 18:30:22 +00:00
Paul Lawrence
ffa3689107 Merge "Add flags to restorecon_recursive to traverse filesystems"
am: 5fbd1cfd34

Change-Id: I539d7e9d441c7bb3f5602b892408a85436b857e8
2016-11-17 17:55:06 +00:00
Paul Lawrence
a8d8434c42 Add flags to restorecon_recursive to traverse filesystems
Use to solve the problem of tracefs conditionally being mounted
under debugfs and needing restorecon'd without boot performance
penalty.

Also move skip-ce to a flag for consistency.

Test: Check that trace_mount has correct attributes after boot
Bug: 32849675
Change-Id: Ib6731f502b6afc393ea5ada96fa95b339f14da49
2016-11-16 22:27:45 +00:00
Tianjie Xu
c488087aa0 Start update_verifier in cache group
Start update_verifier in cache group to avoid dac_override

Bug: 30020920
Change-Id: I227b4a0e1c07e7b9bf209b432e9db02275ffe660
Test: mma
(cherry picked from commit 1e4635f0a8)
2016-11-09 11:57:26 -08:00
Sandeep Patil
cb221cee18 Merge changes from topic 'healthd-charger-split'
* changes:
  healthd: refactor healthd code to split into 'charger' and 'healthd'
  healthd: build 'charger' and 'healthd' binaries
  healthd: refactor to split charger and framework facing code
2016-11-08 23:45:15 +00:00
Sandeep Patil
6012db553c healthd: build 'charger' and 'healthd' binaries
This renames the old '/sbin/healthd' to '/sbin/charger'
which is to be only used in recovery and charger-only mode.

.. and adds a new dynamically linked executable in /system/bin/healthd
to be used as 'healthd' in Android.

   text    data     bss     dec     hex filename
 817404   36704   37960  892068   d9ca4 root/sbin/charger {was healthd}
  72717   11064   12984   96765   179fd system/bin/healthd {*new*}
 890121   47768   50944  988833   f16a1 (TOTALS)

Corresponding changes in recovery and charger-only .rc files are
required change how 'charger' is launched in each mode.

Update the seclable for healthd with the launch path in init.rc

Test: Boot tested and verified all 3 modes (recovery, charge-only,
android)

Change-Id: I4ada27a4c113258c5be1fd10adb0f58232b10024
Signed-off-by: Sandeep Patil <sspatil@google.com>
2016-11-08 07:36:07 -08:00
Paul Lawrence
ef2479247d Merge "Fix selinux warning on tracefs systems" am: 0ad600bdc6 am: 3915012a46 am: 67387a3510
am: a0d26e7cdd

Change-Id: I004165050ab96c3a9a7f1fbcdadf84c22b8256d9
2016-11-07 15:22:23 +00:00
Paul Lawrence
3915012a46 Merge "Fix selinux warning on tracefs systems"
am: 0ad600bdc6

Change-Id: Ibaab6580caf0fe216cfae72bf5d2560fec02afdf
2016-11-07 15:07:22 +00:00
Paul Lawrence
d2abcbd0ab Fix selinux warning on tracefs systems
restorecon_recursive doesn't traverse filesystem boundaries. On
tracefs systems, tracing is a separate filesystem, so restorecon
this as well

Bug: 30963384
Test: Boot hikey, and check that there are no debugfs_tracing denials in dmesg
Change-Id: I24abd3ad80d2cfdab4f64fecee799fc0c24ed238
2016-11-04 10:56:06 -07:00
Steven Moreland
f8f334966d Merge "Update for hidlized hwservicemanager." am: 480af3f633 am: 82c67f5662 am: b394786624
am: 0c54c1e8d6

Change-Id: I8a186016e14aa4137233fc97f949b14bac7f19cd
2016-11-02 22:38:35 +00:00
Steven Moreland
82c67f5662 Merge "Update for hidlized hwservicemanager."
am: 480af3f633

Change-Id: I2c11b0249ab77e9dc22a76f6aa66026ebf3ed00d
2016-11-02 22:23:56 +00:00
Steven Moreland
ba825ac33f Update for hidlized hwservicemanager.
Bug: 32313592
Test: end to end
Change-Id: I76a7ee01413b28e95e9f19fcde90f6372502ec67
2016-11-02 13:29:34 -07:00
Iliyan Malchev
1797eb1f09 init.rc: have hwservicemanager start the HAL class am: 57d66b8447 am: ad0cbcf21c am: f0099ccb23
am: 121fe849e8

Change-Id: I6cba53d417d505b56e8294afaad473399f692beb
2016-09-27 00:22:46 +00:00
Iliyan Malchev
121fe849e8 init.rc: have hwservicemanager start the HAL class am: 57d66b8447 am: ad0cbcf21c
am: f0099ccb23

Change-Id: I5c24ecbf89d723c478a02bcab8cffc4e9e4385e9
2016-09-27 00:16:50 +00:00
Iliyan Malchev
57d66b8447 init.rc: have hwservicemanager start the HAL class
b/31458381
Test: passing build and runtime tests

Change-Id: I1d26af5ca1d0e9c7bbd97cfd88d0b432b50b7216
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-26 00:23:51 -07:00
Ajay Panicker
ac657cd0d2 Merge "Remove net_bt_stack group and replace it with bluetooth" am: 7875407bb7 am: f924c252bd am: b0db9714bb
am: 531b201eb6

Change-Id: Ie822dd8f259f240eb457f5d67948c417f84817c6
2016-09-23 00:04:45 +00:00