Commit graph

1108 commits

Author SHA1 Message Date
Elliott Hughes
a0a31735d1 Merge \\\\"Make klog_fd thread-safe and make klog_init a no-op.\\\\" am: 588b770063 am: 73d363bbc1 am: 7288ac3982
am: 6605b0b23a

Change-Id: I7d50818201e114fb65db8179c14b754afb069bdb
2016-07-08 17:17:32 +00:00
Elliott Hughes
6605b0b23a Merge \\\"Make klog_fd thread-safe and make klog_init a no-op.\\\" am: 588b770063 am: 73d363bbc1
am: 7288ac3982

Change-Id: I46bbcb64eecc01ec7bd8bb502237c1b9057befc4
2016-07-08 17:12:48 +00:00
Elliott Hughes
73d363bbc1 Merge \"Make klog_fd thread-safe and make klog_init a no-op.\"
am: 588b770063

Change-Id: I884276a8f8b8209f6e956c5fb410e8265184e1b5
2016-07-08 17:05:25 +00:00
Yabin Cui
58fcd429c3 Merge \\"init: use libbootloader_message.\\" into nyc-mr1-dev am: ca4cf4e4af
am: 1b8159e7ab

Change-Id: Ib66c41548140a19cbf8bada84ee0da985c8ac0a9
2016-06-30 23:11:19 +00:00
Yabin Cui
1b8159e7ab Merge \"init: use libbootloader_message.\" into nyc-mr1-dev
am: ca4cf4e4af

Change-Id: I8234e796a8b35115ef1ecf33c987882f8fe286cd
2016-06-30 22:55:42 +00:00
Yabin Cui
ca4cf4e4af Merge "init: use libbootloader_message." into nyc-mr1-dev 2016-06-30 21:08:30 +00:00
Yabin Cui
0b1252cca0 init: use libbootloader_message.
Bug: 29582118
Change-Id: I6285b29774a11d6dda8496c7c73e4c1d17a672bd
2016-06-29 16:44:02 -07:00
Elliott Hughes
171a829c39 Make klog_fd thread-safe and make klog_init a no-op.
I'll come back and remove klog_init when I've removed other calls to it.

Change-Id: Iad7fd26d853b4ddc54e9abd44516b6f138cbbfcb
Test: booted N9, looked at "adb shell dmesg" output.
2016-06-29 16:16:41 -07:00
Alex Light
75aa7c04e0 Add umount call to init to unmount a filesystem am: 68ab20febd
am: 40095a6eae

Change-Id: I216e617dfebeb3caf5c5db155512f6b7cf2c2b9f
2016-06-29 22:58:44 +00:00
Alex Light
40095a6eae Add umount call to init to unmount a filesystem
am: 68ab20febd

Change-Id: I1166f88814193092f10dad8a2fa841028613e03e
2016-06-29 22:56:40 +00:00
Jorge Lucangeli Obes
6082c9b446 Merge \\\\"Rename \\\\"Handle(r)\\\\" to \\\\"Parse(r)\\\\" in Android init.\\\\" am: b0d062a497 am: 69e6dde7c6 am: 763581ec76
am: 4e6cf008c6

Change-Id: I280287446f8d85cbfef22a9c2a3491772c7c77b0
2016-06-29 21:58:34 +00:00
Jorge Lucangeli Obes
69e6dde7c6 Merge \"Rename \"Handle(r)\" to \"Parse(r)\" in Android init.\"
am: b0d062a497

Change-Id: If3b070c3ec8599e065980bec123bf8c2cf160222
2016-06-29 21:51:08 +00:00
Jorge Lucangeli Obes
c2cb8eeda0 Merge \\\\"init: Add option to run a service in a new PID/mount namespace.\\\\" am: e71cedf450 am: 5b951eebec am: fa9965feed
am: e90524bddb

Change-Id: I3483bea442b4bb6dd71b232971e559b1f8b90c56
2016-06-29 20:54:35 +00:00
Jorge Lucangeli Obes
177b27d4f5 Rename "Handle(r)" to "Parse(r)" in Android init.
The code in question parses config files, so use the right terminology.

Bug: 29872991
Change-Id: Id9644d9a98c1d702d2990f62b3020a27d073141e
2016-06-29 16:29:53 -04:00
Jorge Lucangeli Obes
5b951eebec Merge \"init: Add option to run a service in a new PID/mount namespace.\"
am: e71cedf450

Change-Id: I963b61c06922ae017fdb27b4a3a99d6519505329
2016-06-29 20:29:07 +00:00
Jorge Lucangeli Obes
1b3fa3d650 init: Add option to run a service in a new PID/mount namespace.
Namespaces are a more consistent isolation primitive than e.g. hiding
/proc.

Bug: 29635190

Change-Id: I7c39975813fb13b3d06be35a24c0854f16549c0a
2016-06-29 14:49:11 -04:00
Alex Light
68ab20febd Add umount call to init to unmount a filesystem
Bug: 29278988
Change-Id: Ia14ab1bcad9513688df97f7b4d9162a9ab282480
2016-06-29 17:36:13 +00:00
Elliott Hughes
4dc40842ba resolve merge conflicts of ab47d14 to master
Change-Id: Idf7b913e1f3ac6eff9ee2b314156c83996505641
2016-06-27 11:31:16 -07:00
Elliott Hughes
7f5b29ff1e resolve merge conflicts of 54c1219 to stage-aosp-master
Change-Id: I4b3b2a8690cfe147929fd096de380a9d4b79f1ec
2016-06-27 09:54:25 -07:00
Elliott Hughes
f86b5a6b90 Move init to libbase logging.
Change-Id: Ibfbefeff587a69e948978a037c555fd12a5ade6a
2016-06-27 08:11:31 -07:00
Elliott Hughes
cbeeeaefb5 Merge \\\\"Remove MTD cruft from init.\\\\" am: 90db709a2f am: 80744d867f am: 77b189acd9
am: db62f10c1d

Change-Id: Ife58caa4905776992fe28374a51bf9048fdb9533
2016-06-25 02:33:27 +00:00
Elliott Hughes
80744d867f Merge \"Remove MTD cruft from init.\"
am: 90db709a2f

Change-Id: I027708dd324000cbfad1a2a6e970f742db97bae5
2016-06-25 02:25:38 +00:00
Elliott Hughes
3195116e97 Remove MTD cruft from init.
Bug: http://b/29250988
Change-Id: I38ab263192944e4ff291fd91b25db163a8848d75
2016-06-24 18:26:30 -07:00
Elliott Hughes
2edd112f50 Merge \\\\"Remove more obsolete MTD stuff.\\\\" am: aa9f37185f am: e9a7f52ce5 am: c3f9902cee
am: 1ad84666e5

Change-Id: I7baf356e5753a003101bca7da730ee5f71d10187
2016-06-24 17:49:47 +00:00
Elliott Hughes
e9a7f52ce5 Merge \"Remove more obsolete MTD stuff.\"
am: aa9f37185f

Change-Id: I7952147c2115d1e205737277376726507aed8447
2016-06-24 17:31:59 +00:00
Treehugger Robot
aa9f37185f Merge "Remove more obsolete MTD stuff." 2016-06-24 17:19:48 +00:00
Elliott Hughes
01e5a6c971 Remove more obsolete MTD stuff.
Bug: http://b/29250988
Change-Id: Ic2d0514fcdbe26526e87bc681b71efcc90eda678
Test: still builds.
2016-06-24 09:13:51 -07:00
Hung-ying Tyan
4e8a1a6895 resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 am: 2acf4a81dc
am: 1e94e12312

Change-Id: I730e6337d5d224b60183dd020dd9098f769974e2
2016-06-24 06:19:04 +00:00
Hung-ying Tyan
23a574a195 resolve merge conflicts of 66277db to stage-aosp-master
Change-Id: I58b1f7fec779c707ac4048ae5401087ec4b7c8b0
2016-06-24 13:21:09 +08:00
Hung-ying Tyan
66277db8d0 Merge "Add -f to insmod" 2016-06-24 04:34:56 +00:00
Hung-ying Tyan
bfa6d75c60 Add -f to insmod
When the flag is on, insmod will bypass vermagic and symbol version
checking in the kernel. This is to make it possible to update kernel
without recompiling kernel modules.

BUG=28803994

Change-Id: Ib4be6999ef52baefd4210ee0d242360e43318907
2016-06-24 11:10:46 +08:00
Chih-Hung Hsieh
c1dda5dccd Merge \\\\"Fix misc-macro-parentheses warnings in system/core.\\\\" am: 495541c5bb am: 65828a0ec9 am: 4a8ab16746
am: 3f646c24a9

Change-Id: I0131e74b001a9f1e56c456a52a327687e07b8955
2016-06-22 23:18:07 +00:00
Chih-Hung Hsieh
65828a0ec9 Merge \"Fix misc-macro-parentheses warnings in system/core.\"
am: 495541c5bb

Change-Id: I021b653779c5119398c31ee354372366ba029328
2016-06-22 22:39:07 +00:00
Chih-Hung Hsieh
cdb2ca5d9f Fix misc-macro-parentheses warnings in system/core.
Add parentheses around macro arguments used beside operators.
Bug: 28705665

Change-Id: I9226f319e283be640eddc31687f75b51a8ef0ac6
2016-06-22 14:33:13 -07:00
Elliott Hughes
9120e502db Merge \\\\"init: report createProcessGroup failure.\\\\" am: 2d690a920f am: 32cc6c9908 am: 5534d11498
am: 55ee52d2c3

Change-Id: Ifc4237595c2d038eb465bd4c65ed4d834e088f14
2016-06-17 19:05:46 +00:00
Elliott Hughes
32cc6c9908 Merge \"init: report createProcessGroup failure.\"
am: 2d690a920f

Change-Id: I4ec8df459aefa4aebb3cdf9ec5aa40bc4e727f39
2016-06-17 04:16:21 +00:00
Elliott Hughes
ad8e94e017 init: report createProcessGroup failure.
Also directly kill the initial pid for safety, like other libprocessgroup
users.

Change-Id: Ib28936aea19cceaeaa54734759d5ae0c252c7905
2016-06-15 14:49:57 -07:00
William Roberts
06a471bf20 Merge \\\\"ueventd: only relabel devices if there\\\\'s a delta\\\\" am: 95428817d6 am: 807fa4bd5c am: 787468260d
am: 487d7f3be3

Change-Id: I4ddd4dbd64c791c02fd8ef51e7f6db356e849405
2016-06-09 19:25:46 +00:00
William Roberts
787468260d Merge \\"ueventd: only relabel devices if there\\'s a delta\\" am: 95428817d6
am: 807fa4bd5c

Change-Id: I41a8c02332ae12dc1c4fbc9c45ee627a37ce6b77
2016-06-09 19:18:40 +00:00
Treehugger Robot
95428817d6 Merge "ueventd: only relabel devices if there's a delta" 2016-06-09 19:07:27 +00:00
Tom Cherry
ffe43f24ea Merge \\\\"init: expand arguments of services when they start\\\\" am: 86cd314af3 am: f6ee6e16d9 am: 39b1d2043e
am: 8fb83d55d0

Change-Id: I9cce70ada4734f42229ab28799a56746d0afa01d
2016-06-08 23:09:14 +00:00
Tom Cherry
39b1d2043e Merge \\"init: expand arguments of services when they start\\" am: 86cd314af3
am: f6ee6e16d9

Change-Id: I995a23e3eaa19bca1c4dc7880d786b806bd53306
2016-06-08 22:55:40 +00:00
Tom Cherry
86cd314af3 Merge "init: expand arguments of services when they start" 2016-06-08 22:42:11 +00:00
Vitalii Tomkiv
1327c03a17 Merge \\\\"Add process priority to service definition.\\\\" am: 14b00baaae am: 20cc2787cb am: 69cfeabfc0
am: d85df85cc5

Change-Id: I96a1e2e55e1fa9e18c648342b6c3ce6d613916b1
2016-06-08 21:47:38 +00:00
Vitalii Tomkiv
69cfeabfc0 Merge \\"Add process priority to service definition.\\" am: 14b00baaae
am: 20cc2787cb

Change-Id: I12993eed4953a7bdd832de0c263ce8d4c2476969
2016-06-08 21:42:31 +00:00
Vitalii Tomkiv
081705c258 Add process priority to service definition.
This change allows to set prioirrity of the process to be set through
*.rc file.

Bug: 28866384
Change-Id: If0108ef05c8a151749c43d2d7de1187653255ce8
2016-06-08 13:22:14 -07:00
Mark Salyzyn
de1433715f Manually fix automerger error on 4ab7548 am: a6f1c46fa0 am: 5e2beeb8da
am: fb2e64effb

* commit 'fb2e64effba531e5ed5f6c8890b266e6d21bfbd7':
  init: Add support for ${x.y:-default} expansion

Change-Id: I90e6fa8312dbeeea50ba42d92cc0c4082059ce23
2016-06-07 20:47:12 +00:00
Mark Salyzyn
5e2beeb8da Manually fix automerger error on 4ab7548
am: a6f1c46fa0

* commit 'a6f1c46fa04cf6b35b77bf249af11a3ffbe562e3':
  init: Add support for ${x.y:-default} expansion

Change-Id: If03b9453ed461e5878ecefc8863b164a683c10a4
2016-06-07 20:42:24 +00:00
Tom Cherry
bac3536cc9 init: expand arguments of services when they start
Arguments of commands are expanded based on properties if they contain
${property.name}, however this is not currently done for arguments of
services.

This patch makes it that arguments of services are expanded each time
that the service starts at the point immediately before execve().

Change-Id: Iba581a8377e25a6478d4d2ec2e8b29e181d8640c
2016-06-07 11:22:00 -07:00
Mark Salyzyn
4b56162a33 init: Add support for ${x.y:-default} expansion
commit 00ede7d262 (init: do
expand_props before calling the builtins) broke logpersist

Bug: 28120456
Bug: 22654233
Change-Id: Ib4d8231665b26ac083b02243177493fab41c8978
2016-06-07 18:09:17 +00:00