Greg Hackmann
5ebd8e43ba
am b2406973: Merge changes I727d9135,I3bd1b59d,I0d05aa28
...
* commit 'b240697339b1ff1f45217a48dc9d3fa8a2f21a2b':
rootdir: add ueventd.rc rule for adf subsystem
init: add subsystem rules to ueventd.rc
init: handle ueventd path truncation better
2013-11-26 14:01:04 -08:00
Greg Hackmann
b240697339
Merge changes I727d9135,I3bd1b59d,I0d05aa28
...
* changes:
rootdir: add ueventd.rc rule for adf subsystem
init: add subsystem rules to ueventd.rc
init: handle ueventd path truncation better
2013-11-26 21:25:20 +00:00
Greg Hackmann
95b348c5d7
rootdir: add ueventd.rc rule for adf subsystem
...
Change-Id: I727d91355229692c11e0e309c0fcac051269eba3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 13:18:26 -08:00
Greg Hackmann
3312aa8379
init: add subsystem rules to ueventd.rc
...
By default ueventd creates device nodes under /dev based on the ueventd
DEVPATH. Several subsystems have special rules which are hardcoded in
devices.c. Moving forward these special rules should go in ueventd.rc.
Special rules have the syntax:
subsystem <s>
devname (uevent_devname|uevent_devpath)
[dirname <dir>]
Devices matching SUBSYSTEM=<s> will be populated under <dir>. dirname
is optional and defaults to /dev. If dirname is provided, <dir> must
start with "/".
If devname is uevent_devname, ueventd will create the device node as
<dir>/DEVNAME. DEVNAME may include intermediate subdirectories, which
ueventd will automatically create.
If devname is uevent_devpath, ueventd will use the legacy behavior of
computing DEVPATH_BASE=basepath(DEVPATH), and creating the device node
as <dir>/DEVPATH_BASE.
The new parsing code is based on init_parser.c, with small tweaks to
handle commands which don't fall under a section header.
Change-Id: I3bd1b59d7e62dfc9d289cf6ae889e237fb5bd7c5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 13:18:23 -08:00
Greg Hackmann
f6e009ee26
init: handle ueventd path truncation better
...
Log an error before discarding problematic events, and add a missing
truncation check to the usb subsystem's unique codepath
Change-Id: I0d05aa287ffc63b46d1752d2a7409d35dc8caca7
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 13:17:35 -08:00
Greg Hackmann
675c996651
am 0914e01e: Merge "init: limit visibility of init_parser.c helpers"
...
* commit '0914e01ed9936602006ed4a6891c5e55a42e881a':
init: limit visibility of init_parser.c helpers
2013-11-26 13:06:43 -08:00
Greg Hackmann
0914e01ed9
Merge "init: limit visibility of init_parser.c helpers"
2013-11-26 20:58:43 +00:00
Elliott Hughes
8bda6ce557
am 121400a4: Merge "Make init distinguish between orderly exit and being killed by signals."
...
* commit '121400a40fce22b6e0b74f2492b8b9eff6133bd1':
Make init distinguish between orderly exit and being killed by signals.
2013-11-26 10:49:59 -08:00
Elliott Hughes
121400a40f
Merge "Make init distinguish between orderly exit and being killed by signals."
2013-11-26 18:42:23 +00:00
Stephen Hines
f4083caec0
am e456d420: Merge "libpixelflinger: do not use anonymous structs"
...
* commit 'e456d420a5bdd1085f587a7906b58aabcb43f220':
libpixelflinger: do not use anonymous structs
2013-11-26 08:38:36 -08:00
Stephen Hines
e456d420a5
Merge "libpixelflinger: do not use anonymous structs"
2013-11-26 00:54:00 +00:00
Elliott Hughes
6c5ad5c2ce
Make init distinguish between orderly exit and being killed by signals.
...
Bug: 11826724
Change-Id: I7c11f602447dbd6862decc51cdfe883003cf7d67
2013-11-25 16:33:53 -08:00
JP Abgrall
ec51d818c5
am 71f2f251: Merge "logwrapper: fix missing include"
...
* commit '71f2f2514ee40a6d9b66545049855ab371955bed':
logwrapper: fix missing include
2013-11-25 11:51:38 -08:00
JP Abgrall
71f2f2514e
Merge "logwrapper: fix missing include"
2013-11-25 19:45:43 +00:00
Greg Hackmann
d68db71e75
init: limit visibility of init_parser.c helpers
...
To prevent clashing with forthcoming changes to uevent_parser.c
Change-Id: I2ee183261c7f43e0e4104a16a280c7ee73d7df96
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-25 11:24:16 -08:00
synergy dev
cd2fe3b49b
libpixelflinger: do not use anonymous structs
...
Avoiding the use of gnu extensions improves code portability
Change-Id: Ie9e94e3ce030f52a22997f8a48de1e6c1c549894
2013-11-25 18:54:56 +00:00
William Roberts
5605cdade8
logwrapper: fix missing include
...
Use of ECHILD with no definitive errno.h inclusion.
Explicitly listing the errno.h header file rather
then relying on the inclusion chain to do so.
Change-Id: I5552acd928d17fc62192217a30ff2e4fab0b1936
2013-11-25 17:25:47 +00:00
The Android Open Source Project
d61ade1ddc
am 66ed50af: Merge commit \'536dea9d61a032e64bbe584a97463c6638ead009\' into HEAD
...
* commit '66ed50af6870210ce013a5588a688434a5d48ee9':
2013-11-22 19:19:59 -08:00
The Android Open Source Project
66ed50af68
Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD
...
Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
2013-11-22 13:44:43 -08:00
Todd Poynor
fd1dd864a8
am 479efb54: init.rc: mount pstore fs, set console-ramoops permissions
...
* commit '479efb540a198a9b7cd278387b0d45009a05bb2b':
init.rc: mount pstore fs, set console-ramoops permissions
2013-11-22 10:42:17 -08:00
Elliott Hughes
bbdfc0c412
am dd2ac3de: am d966eebf: Merge "Fix build."
...
* commit 'dd2ac3de625e6c0328a0f70530d8ade0d2151bfc':
Fix build.
2013-11-21 22:18:38 -08:00
Elliott Hughes
dd2ac3de62
am d966eebf: Merge "Fix build."
...
* commit 'd966eebfcba313477a598ad7b3e573a123a7a9af':
Fix build.
2013-11-21 22:14:41 -08:00
Elliott Hughes
d966eebfcb
Merge "Fix build."
2013-11-22 06:12:19 +00:00
Elliott Hughes
f98e4bf7fb
Fix build.
...
Change-Id: I6552bf9f83faa97bd5a844381aceb3ef85f86c76
2013-11-21 22:09:46 -08:00
Todd Poynor
479efb540a
init.rc: mount pstore fs, set console-ramoops permissions
...
Change-Id: I44cb00f9123c6044a03de926b6a616da753bb549
2013-11-21 20:23:54 -08:00
Elliott Hughes
330b1afc13
am 486ebac5: am a6fbc0f9: Merge "Replace __reboot call with syscall"
...
* commit '486ebac551d64bb8698bbc805f71f5644d2c4917':
Replace __reboot call with syscall
2013-11-21 18:43:50 -08:00
Elliott Hughes
b6ee39bca4
am 4a4616f6: am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"
...
* commit '4a4616f6450f191faf168a10b6e2ffaba14803bd':
split setptop ethernet tcp buffer from wifi
2013-11-21 17:15:09 -08:00
Elliott Hughes
127eab2529
am 8ab9ece2: am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."
...
* commit '8ab9ece2e9c6e246f66357c800d6d1ba61becc00':
Switch MIPS over to <sys/user.h>.
2013-11-21 17:07:45 -08:00
Lorenzo Colitti
4fe95effe5
am 85fddd86: am cbc32e9f: Merge "Support parsing RDNSS ND options from netlink."
...
* commit '85fddd867b06cf10ba8f79d0d37c4b65fa47cf8a':
Support parsing RDNSS ND options from netlink.
2013-11-21 17:01:44 -08:00
Lorenzo Colitti
09e5ef65cd
am 6231f7f0: am 71dd5ba4: Merge "Switch back to subsystem "net" for netlink events."
...
* commit '6231f7f07b1d2476e57410d5b8f7cbed72b893b7':
Switch back to subsystem "net" for netlink events.
2013-11-21 17:01:43 -08:00
Lorenzo Colitti
1df045d952
am ee676317: am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."
...
* commit 'ee676317b0d5b98968b8dc99d34b2ec0e60180ab':
Get rid of an infinite loop in NetlinkEvent.cpp.
2013-11-21 17:01:42 -08:00
Lorenzo Colitti
2cfa317c01
am 740bf8da: (-s ours) am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."
...
* commit '740bf8da310308bb5419468e2bf6d3920b8d6385':
Parse IP address changes in NetlinkEvent.
2013-11-21 17:01:41 -08:00
Elliott Hughes
486ebac551
am a6fbc0f9: Merge "Replace __reboot call with syscall"
...
* commit 'a6fbc0f9f49b797f4a67ea49f37681c08ab41111':
Replace __reboot call with syscall
2013-11-21 12:38:39 -08:00
Elliott Hughes
a6fbc0f9f4
Merge "Replace __reboot call with syscall"
2013-11-21 20:35:50 +00:00
Pavel Chupin
dccdb94284
Replace __reboot call with syscall
...
__reboot is hidden for 64-bits and should be hidden on others
Change-Id: Ib6435269aac7fa726e49cc02f8f76d2be2875bc6
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-11-21 12:35:12 -08:00
Elliott Hughes
4a4616f645
am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"
...
* commit '048bb92f3f33196d96a51b446c73805e208a5333':
split setptop ethernet tcp buffer from wifi
2013-11-20 18:10:49 -08:00
Elliott Hughes
048bb92f3f
Merge "split setptop ethernet tcp buffer from wifi"
2013-11-21 02:07:38 +00:00
Elliott Hughes
8ab9ece2e9
am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."
...
* commit '162c9a247b2f62065c997c1085637f28e0fcde94':
Switch MIPS over to <sys/user.h>.
2013-11-20 12:33:55 -08:00
Elliott Hughes
162c9a247b
Merge "Switch MIPS over to <sys/user.h>."
2013-11-20 20:31:21 +00:00
Elliott Hughes
76e7f5e508
Switch MIPS over to <sys/user.h>.
...
Bug: 11559337
Change-Id: I47ce51ec2d45d9cfdfbb6cccce93a66b0f02d967
2013-11-20 11:31:29 -08:00
Lorenzo Colitti
85fddd867b
am cbc32e9f: Merge "Support parsing RDNSS ND options from netlink."
...
* commit 'cbc32e9f7e95d9c35ec5d855a13fd9346e9f55bf':
Support parsing RDNSS ND options from netlink.
2013-11-19 18:38:17 -08:00
Lorenzo Colitti
6231f7f07b
am 71dd5ba4: Merge "Switch back to subsystem "net" for netlink events."
...
* commit '71dd5ba4647fdecde0a44793f246fb0274159cbe':
Switch back to subsystem "net" for netlink events.
2013-11-19 18:38:16 -08:00
Lorenzo Colitti
ee676317b0
am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."
...
* commit 'a0b3fef0b78e8c6ef38eac6bcd6da7db6a841522':
Get rid of an infinite loop in NetlinkEvent.cpp.
2013-11-19 18:38:16 -08:00
Lorenzo Colitti
740bf8da31
am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."
...
* commit '8c099bc206094dd229f4468b85c23b8639fb05ea':
Parse IP address changes in NetlinkEvent.
2013-11-19 18:38:15 -08:00
Lorenzo Colitti
cbc32e9f7e
Merge "Support parsing RDNSS ND options from netlink."
2013-11-20 02:22:19 +00:00
Lorenzo Colitti
71dd5ba464
Merge "Switch back to subsystem "net" for netlink events."
2013-11-20 02:22:01 +00:00
Lorenzo Colitti
a0b3fef0b7
Merge "Get rid of an infinite loop in NetlinkEvent.cpp."
2013-11-20 02:21:44 +00:00
Lorenzo Colitti
8c099bc206
Merge "Parse IP address changes in NetlinkEvent."
2013-11-20 02:21:30 +00:00
Lorenzo Colitti
c7eec83f08
Support parsing RDNSS ND options from netlink.
...
The RDNSS options (RFC 6106) used to configure DNS servers via
router advertisements are passed from the kernel to userspace via
RTM_NEWNDUSEROPT netlink messages. Add code to NetlinkEvent to
parse them.
Also fix a compiler warning and a couple of style issues.
[Cherry-pick of b185e90dcc
]
Bug: 9180552
Change-Id: I6c532c8f0ceef3afdc977a431a036df398013e1a
2013-11-20 10:31:19 +09:00
Lorenzo Colitti
526b838c9d
Switch back to subsystem "net" for netlink events.
...
The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".
Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.
[Cherry-pick of f34861346d
]
Bug: 10433320
Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
2013-11-20 10:29:42 +09:00