Robert Benea
9865760d3d
Merge "Add memcg related configs to init." am: b84666cbc0 am: 7564622f88 am: 5cf308bcde
...
am: eab1c14aba
2017-07-19 01:22:40 +00:00
Robert Benea
eab1c14aba
Merge "Add memcg related configs to init." am: b84666cbc0 am: 7564622f88
...
am: 5cf308bcde
2017-07-19 01:12:40 +00:00
Robert Benea
5cf308bcde
Merge "Add memcg related configs to init." am: b84666cbc0
...
am: 7564622f88
2017-07-19 01:03:32 +00:00
Robert Benea
7564622f88
Merge "Add memcg related configs to init."
...
am: b84666cbc0
2017-07-19 01:01:27 +00:00
Robert Benea
b84666cbc0
Merge "Add memcg related configs to init."
2017-07-19 00:54:41 +00:00
Quang Luong
559674dbe3
Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" am: a022ea424d am: c1e78e1331 am: be2a262b47
...
am: 6bcf4fb8b5
2017-07-18 23:24:51 +00:00
Robert Benea
d485226951
Add memcg related configs to init.
...
Allow configuring memory.swappiness, memory.soft_limit_in_bytes
and memory.limit_in_bytes by init; by doing so there is better
control of memory consumption per native app.
Test: tested on gobo branch.
bug: 63765067
Change-Id: I8906f3ff5ef77f75a0f4cdfbf9d424a579ed52bb
2017-07-18 15:58:40 -07:00
Quang Luong
6bcf4fb8b5
Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" am: a022ea424d am: c1e78e1331
...
am: be2a262b47
2017-07-18 22:39:00 +00:00
Quang Luong
be2a262b47
Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" am: a022ea424d
...
am: c1e78e1331
2017-07-18 21:26:19 +00:00
Quang Luong
c1e78e1331
Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp"
...
am: a022ea424d
2017-07-18 21:20:26 +00:00
Treehugger Robot
a022ea424d
Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp"
2017-07-18 21:16:30 +00:00
Quang Luong
dd6a85ccd5
uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp
...
Modified Android.mk to define cflag "USER_MODE_LINUX" if
TARGET_USER_MODE_LINUX := true in BoardCofig.mk.
Modified set_mmap_rnd_bits_action to return 0 if "USER_MODE_LINUX" is
defined. This is needed since uml does not support the mmap_rnd_bits
sysctl, and init would otherwise crash without this check.
Test: manual
Bug: 32523022
Change-Id: I409ef64a1fa253bfb3f9fb59d0267be159819bb8
Signed-off-by: Quang Luong <qal@google.com>
2017-07-18 18:18:31 +00:00
Keun-young Park
29017c10c8
Merge "Do not umount /vendor, /system, and /oem even if they are R/W." am: 11649e8925 am: c9f601a178 am: 10b74ed2a6
...
am: ab54410f0d
2017-07-18 03:21:07 +00:00
Keun-young Park
ab54410f0d
Merge "Do not umount /vendor, /system, and /oem even if they are R/W." am: 11649e8925 am: c9f601a178
...
am: 10b74ed2a6
2017-07-18 03:18:07 +00:00
Keun-young Park
10b74ed2a6
Merge "Do not umount /vendor, /system, and /oem even if they are R/W." am: 11649e8925
...
am: c9f601a178
2017-07-18 03:15:36 +00:00
Keun-young Park
c9f601a178
Merge "Do not umount /vendor, /system, and /oem even if they are R/W."
...
am: 11649e8925
2017-07-18 03:12:37 +00:00
Keun-young Park
6e12b3887e
Do not umount /vendor, /system, and /oem even if they are R/W.
...
- /vendor, /system, /oem can be remounted to R/W for development
purpose.
- In such case, umounting these partitions can lead into some processes
not running properly during shutdown or blocking umount of fs.
- So skip them. As it is dev feature, it is up to each developer to
understand the risk. But for normal adb sync - reboot should be ok
as shutdown involves sync operations.
bug: 37737296
Test: adb remount,reboot, and check last kmsg
Change-Id: Iab6a6374bc558375d359b3b49b14db93d363b1ad
2017-07-17 17:32:26 -07:00
Tom Cherry
bbd8b8b534
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads" am: 0ba56096d5 am: 730a5ddf27 am: 92b34b76b5
...
am: 643307dbd0
2017-07-17 20:04:37 +00:00
Tom Cherry
643307dbd0
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads" am: 0ba56096d5 am: 730a5ddf27
...
am: 92b34b76b5
2017-07-17 20:01:06 +00:00
Tom Cherry
92b34b76b5
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads" am: 0ba56096d5
...
am: 730a5ddf27
2017-07-17 19:58:37 +00:00
Tom Cherry
730a5ddf27
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads"
...
am: 0ba56096d5
2017-07-17 19:56:06 +00:00
Tom Cherry
c2e181cf1d
ueventd: add tests for setegid()/setfscreatecon() and threads
...
setegid() and setfscreatecon() on Android both operate on a per-thread
basis, not a per-process basis.
Ueventd may take advantage of this in the future, so this CL
introduces tests that ensure that this functionality remains
consistent.
Bug: 63441941
Test: newly added unit tests
Change-Id: I8b1c62cc322b6fe44b748550a4cea8658d9efd88
2017-07-17 11:08:41 -07:00
Tom Cherry
d7ca913892
Merge "Move Timer from init to libbase" am: 896297b2ef am: 7ff0b008f7 am: 4e5c4f18d8
...
am: c0a9cf648b
2017-07-10 18:40:54 +00:00
Tom Cherry
c0a9cf648b
Merge "Move Timer from init to libbase" am: 896297b2ef am: 7ff0b008f7
...
am: 4e5c4f18d8
2017-07-10 18:36:54 +00:00
Tom Cherry
4e5c4f18d8
Merge "Move Timer from init to libbase" am: 896297b2ef
...
am: 7ff0b008f7
2017-07-10 18:32:54 +00:00
Tom Cherry
7ff0b008f7
Merge "Move Timer from init to libbase"
...
am: 896297b2ef
2017-07-10 18:28:25 +00:00
Tom Cherry
ede0d53850
Move Timer from init to libbase
...
Test: boot bullhead
Test: new libbase unit tests
Change-Id: Ic398a1daa1fe92c10ea7bc1e6ac3f781cee9a5b5
2017-07-10 09:28:24 -07:00
Jin Qian
e6dfd45f00
init: require e2fsdroid and mke2fs when building init am: 041f849548
...
am: f361c2560c
2017-07-06 21:13:13 +00:00
Jin Qian
f361c2560c
init: require e2fsdroid and mke2fs when building init
...
am: 041f849548
2017-07-06 20:55:36 +00:00
Jin Qian
041f849548
init: require e2fsdroid and mke2fs when building init
...
init calls fs_mgr to format ext4 partitions. This requires
e2fsdroid and mke2fs in /system/bin/
Bug: 35219933
Change-Id: Ia32fe438cd9b9332f8e18e0cbe7f61bd050adcb1
2017-07-06 11:45:06 -07:00
Keun-young Park
3b15f44041
Merge "add "shutdown critical" to service" into oc-dr1-dev
2017-07-06 17:14:23 +00:00
Tom Cherry
c680bfeaf2
init: add info logs in first stage mount if we have to poll
...
It's not a error case if we do not find a device that we're attempting
to regenerate uevents for during first stage mount, but it is likely
to increase boot time, so we log a message to attribute this delay.
Bug: 63327193
Test: Boot bullhead, sailfish
Merged-In: I97c2e5aefd218bbdd87717ff3c375381f725de08
Change-Id: I97c2e5aefd218bbdd87717ff3c375381f725de08
(cherry picked from commit 322e176f6a
2017-07-06 13:04:23 +08:00
Tom Cherry
e0d1699487
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f am: 11d5611ba5 am: 7b600f8012
...
am: 71ed340d1e
2017-07-06 04:55:40 +00:00
Tom Cherry
71ed340d1e
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f am: 11d5611ba5
...
am: 7b600f8012
2017-07-06 04:53:38 +00:00
Tom Cherry
7b600f8012
Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f
...
am: 11d5611ba5
2017-07-06 04:51:08 +00:00
Tom Cherry
11d5611ba5
Merge "init: add info logs in first stage mount if we have to poll"
...
am: 6a9d56775f
2017-07-06 04:48:38 +00:00
Treehugger Robot
6a9d56775f
Merge "init: add info logs in first stage mount if we have to poll"
2017-07-06 04:46:05 +00:00
Tom Cherry
1b5db82fd9
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4 am: 1eee2122ca
...
am: 7c4b63be8c
2017-07-06 02:53:11 +00:00
Tom Cherry
7c4b63be8c
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4
...
am: 1eee2122ca
2017-07-06 02:33:52 +00:00
Tom Cherry
1eee2122ca
Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
...
am: e944b7e0a4
2017-07-06 02:21:26 +00:00
Tom Cherry
e944b7e0a4
Merge "ueventd: don't double fork firmware handlers"
...
am: 0f4fb5497a
2017-07-06 02:10:57 +00:00
Tom Cherry
0f4fb5497a
Merge "ueventd: don't double fork firmware handlers"
2017-07-06 02:02:33 +00:00
Keun-young Park
f5b616dabf
Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf
...
am: bedc5faea7
2017-07-06 01:38:15 +00:00
Keun-young Park
bedc5faea7
Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328
...
am: 19ec8e7bcf
2017-07-06 01:13:19 +00:00
Keun-young Park
19ec8e7bcf
Merge "add "shutdown critical" to service" am: b3915d113d
...
am: a4ad5d0328
2017-07-06 00:56:18 +00:00
Keun-young Park
d266d37e4c
add "shutdown critical" to service
...
- "shutdown critical" prevents killing the service during
shutdown. And the service will be started if not running.
- Without it, services will be killed by SIGTERM / SIGKILL during shutdown.
- Even services with "shutdown critical" will be killed if shutdown
times out.
- Removes ueventd and vold from hard coded list. Each service's rc will
be updated to add "shutdown critical". watchdogd is still kept in the list.
bug: 37626581
Test: reboot and check last kmsg
(cherry picked from commit cccb34fce8
2017-07-06 00:54:02 +00:00
Keun-young Park
a4ad5d0328
Merge "add "shutdown critical" to service"
...
am: b3915d113d
2017-07-06 00:46:31 +00:00
Treehugger Robot
b3915d113d
Merge "add "shutdown critical" to service"
2017-07-06 00:40:55 +00:00
Wei Wang
a89b61ad99
Merge "init: Support custom shutdown actions" am: c1bc4241f8 am: 5b89535442 am: b39890048c
...
am: 2a38e6d119
2017-07-06 00:22:45 +00:00
Tom Cherry
38728d6ca8
Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp
...
am: 93e81d4775
2017-07-06 00:21:01 +00:00
