Felipe Leme
704fe2d628
resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp
...
Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8
2016-07-29 16:12:40 +00:00
Dmitry Shmidt
16efc4d63e
Merge \\\"ueventd: Remove verbose restorecon_recursive: message\\\" am: 345754313e am: 2d5dfa89ae
...
am: 45d9f24cd4
2016-07-28 22:25:40 +00:00
Dmitry Shmidt
2d5dfa89ae
Merge \"ueventd: Remove verbose restorecon_recursive: message\"
...
am: 345754313e
2016-07-28 22:19:18 +00:00
Felipe Leme
c64c982e72
Improved keychord logging.
...
Often a bugreport is accidentally triggered by the combo keys, but there
is nothing in the bugreport to confirm that action because init's
klog level is KLOG_NOTICE_LEVEL.
This change change keychord's INFO messages to NOTICE, and also logs the
case where a service was not launched because ADB was disabled.
BUG: 30440213
BUG: 30345559
Change-Id: I6ccadef1621cb41dcd15e7c1660366f0e147dc7a
2016-07-28 14:11:32 -07:00
Dmitry Shmidt
7eed474db4
ueventd: Remove verbose restorecon_recursive: message
...
Bug: 30478300
Change-Id: Ife69bb5644c3f65f3a256dc042ae1c7fbfb77729
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-07-28 13:55:39 -07:00
Elliott Hughes
a9f814239b
Merge \\\"Fix early init logging.\\\" am: 6d232ab4de am: 1cbd1f5016
...
am: 7e336c8fe5
2016-07-27 15:36:13 +00:00
Elliott Hughes
1cbd1f5016
Merge \"Fix early init logging.\"
...
am: 6d232ab4de
2016-07-27 15:30:45 +00:00
Treehugger Robot
6d232ab4de
Merge "Fix early init logging."
2016-07-27 15:28:18 +00:00
Elliott Hughes
35f5d04620
Fix early init logging.
...
Remove the /dev/__kmsg__ workarounds (which can then be removed
from sepolicy), and fix confusion in the translation between
android-base logging and kernel logging priorities (in particular,
where 'notice' comes in the hierarchy).
Bug: http://b/30317429
Change-Id: I6eaf9919904b6b55bc402c20bf1a4ae269014bc7
Test: adb shell dmesg | grep init
2016-07-26 09:32:33 -07:00
Elliott Hughes
ef6975b675
Merge \\\"Improve init Service logging.\\\" am: c1d9ac1f85 am: b49e54b1d7
...
am: 3fca6fba2b
2016-07-26 15:27:04 +00:00
Elliott Hughes
b49e54b1d7
Merge \"Improve init Service logging.\"
...
am: c1d9ac1f85
2016-07-26 15:21:38 +00:00
Elliott Hughes
e18e7e5c43
Improve init Service logging.
...
Say which service.
Don't ignore setpgid failures.
Change-Id: Ifa8eba583cc3cbf3d26763977bf8c3c9835271c6
2016-07-25 18:18:16 -07:00
Jeff Sharkey
91404d9481
Merge \"Only restorecon CE storage after unlocked.\" into nyc-mr1-dev
...
am: 96f387e8c0
2016-07-18 16:06:34 +00:00
Amit Pundir
114a00ea03
Merge \\\"init: select usb gadget controller at run time\\\" am: 916f5e873e am: 91272bd435
...
am: aff2347646
2016-07-15 23:01:34 +00:00
Amit Pundir
91272bd435
Merge \"init: select usb gadget controller at run time\"
...
am: 916f5e873e
2016-07-15 22:53:21 +00:00
Jeff Sharkey
1635afe83d
Only restorecon CE storage after unlocked.
...
On FBE devices, the filenames inside credential-encrypted directories
are mangled until the key is installed. This means the initial
restorecon at boot needs to skip these directories until the keys
are installed.
This CL changes the implementation of the "restorecon_recursive"
built-in command to use the new SKIPCE flag to avoid labeling files
in CE directories. vold will request a restorecon when the keys
are actually installed.
Bug: 30126557
Change-Id: I320584574a4d712c493b5bbd8a79b56c0c04aa58
2016-07-15 16:21:42 -06:00
Amit Pundir
d2e74db475
init: select usb gadget controller at run time
...
Right now we set sys.usb.controller property in init.$platform.usb.rc
to enable ConfigFS gadgets.
Let system detect and set UDC driver name from /sys/class/udc instead.
Change-Id: I99ad49d24dc53b543c5573e209bf00d6c2d91dd4
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-07-15 15:01:43 -07:00
Mark Salyzyn
109d7d23c5
init: Add support for ${x.y:-default} expansion
...
commit 00ede7d262
2016-07-13 23:55:34 +00:00
Tom Cherry
b79e076e5e
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().
Bug: 28788401
Change-Id: Iba581a8377e25a6478d4d2ec2e8b29e181d8640c
2016-07-13 23:54:42 +00:00
Jorge Lucangeli Obes
67410f8578
Merge \\\"Refactor Service::Start method.\\\" am: 82d2bcc21e am: f2ffdac47a
...
am: 77dbaad7b9
2016-07-11 17:21:18 +00:00
Jorge Lucangeli Obes
f2ffdac47a
Merge \"Refactor Service::Start method.\"
...
am: 82d2bcc21e
2016-07-11 17:13:26 +00:00
Treehugger Robot
82d2bcc21e
Merge "Refactor Service::Start method."
2016-07-11 17:08:45 +00:00
Jorge Lucangeli Obes
344d01f99f
Refactor Service::Start method.
...
This CL extracts code from Service::Start into four helper functions,
bringing Service::Start down to 134 lines vs 212 lines originally. This
makes the method a lot easier to follow. There is no change in behaviour.
Also, make error messages consistent (start with lowercase) and
format Service::Start to fit in 100 cols.
Bug: 30035168
Change-Id: If979976fba4d339a336d030f802ca9f169fd012c
2016-07-11 09:57:17 -04:00
Elliott Hughes
6605b0b23a
Merge \\\"Make klog_fd thread-safe and make klog_init a no-op.\\\" am: 588b770063 am: 73d363bbc1
...
am: 7288ac3982
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
2016-07-08 17:05:25 +00:00
Yabin Cui
1b8159e7ab
Merge \"init: use libbootloader_message.\" into nyc-mr1-dev
...
am: ca4cf4e4af
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
40095a6eae
Add umount call to init to unmount a filesystem
...
am: 68ab20febd
2016-06-29 22:56:40 +00:00
Jorge Lucangeli Obes
69e6dde7c6
Merge \"Rename \"Handle(r)\" to \"Parse(r)\" in Android init.\"
...
am: b0d062a497
2016-06-29 21:51:08 +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
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
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
80744d867f
Merge \"Remove MTD cruft from init.\"
...
am: 90db709a2f
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
e9a7f52ce5
Merge \"Remove more obsolete MTD stuff.\"
...
am: aa9f37185f
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
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
65828a0ec9
Merge \"Fix misc-macro-parentheses warnings in system/core.\"
...
am: 495541c5bb
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
32cc6c9908
Merge \"init: report createProcessGroup failure.\"
...
am: 2d690a920f
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
787468260d
Merge \\"ueventd: only relabel devices if there\\'s a delta\\" am: 95428817d6
...
am: 807fa4bd5c
2016-06-09 19:18:40 +00:00
