summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f8b0743e: Merge "init: fix write_file checkreqprot logic error"Nick Kralevich2015-04-252-8/+10
|\ | | | | | | | | * commit 'f8b0743ef418c15fe622143a6b4b42b102a07803': init: fix write_file checkreqprot logic error
| * Merge "init: fix write_file checkreqprot logic error"Nick Kralevich2015-04-252-8/+10
| |\
| | * init: fix write_file checkreqprot logic errorNick Kralevich2015-04-252-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | write_file() returned -errno on error, not -1. Callers who check for -1 would falsely believe that the write was successful when it wasn't. Fixup write_file so that it return -1 on error consistent with other functions. Change-Id: Ic51aaf8678d8d97b2606bd171f11b3b11f642e39
* | | am 47a9ef2f: Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures."Elliott Hughes2015-04-251-24/+20
|\ \ \ | |/ / | | | | | | | | | * commit '47a9ef2f116fd885a3ba0e9027a45b2a68cc5b3f': Improve logging of USBDEVFS_CLAIMINTERFACE failures.
| * | Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures."Elliott Hughes2015-04-251-24/+20
| |\ \ | | |/ | |/|
| | * Improve logging of USBDEVFS_CLAIMINTERFACE failures.Elliott Hughes2015-04-251-24/+20
| |/ | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=170054 Change-Id: I9b11eb019093e3322da0a8e70d6e17de4c25ab75
* | am 8929c77a: Merge "init: remove mkdir /dev /proc /sys"Nick Kralevich2015-04-251-4/+0
|\ \ | |/ | | | | | | * commit '8929c77ab9aa9be612291809669e9162837c54ae': init: remove mkdir /dev /proc /sys
| * Merge "init: remove mkdir /dev /proc /sys"Nick Kralevich2015-04-251-4/+0
| |\
| | * init: remove mkdir /dev /proc /sysNick Kralevich2015-04-251-4/+0
| |/ | | | | | | | | | | | | These directories are already present in the initial ramdisk, and these mkdir calls are no-ops. Change-Id: I528f9e96a3471de904845a2f9e09c1b6ff83a708
* | am 6ce5625d: Merge "Improve toolbox SIGPIPE behavior."Elliott Hughes2015-04-252-6/+15
|\ \ | |/ | | | | | | * commit '6ce5625d58c2376b719802a0ae0b56bcd3afcdc8': Improve toolbox SIGPIPE behavior.
| * Merge "Improve toolbox SIGPIPE behavior."Elliott Hughes2015-04-252-6/+15
| |\
| | * Improve toolbox SIGPIPE behavior.Elliott Hughes2015-04-252-6/+15
| |/ | | | | | | | | | | | | | | None of our tools -- except for top, which I'd fixed previously -- handles SIGPIE correctly. Let's just handle SIGPIPE in the driver. Bug: https://code.google.com/p/android/issues/detail?id=157920 Change-Id: I322ea411f53c71585a64118c217d54389f675d4e
* | am 9798023e: Merge "Add ReadFully and WriteFully to libbase."Elliott Hughes2015-04-253-0/+52
|\ \ | |/ | | | | | | * commit '9798023e9f646a51222b5fd4683c91bfbfc5167f': Add ReadFully and WriteFully to libbase.
| * Merge "Add ReadFully and WriteFully to libbase."Elliott Hughes2015-04-253-0/+52
| |\
| | * Add ReadFully and WriteFully to libbase.Elliott Hughes2015-04-243-0/+52
| | | | | | | | | | | | Change-Id: I6b7aa2a93398e7acdd1d74c71d9abed08a72b3c4
* | | am 2899c94b: Merge "Switch init to epoll."Elliott Hughes2015-04-258-87/+60
|\ \ \ | |/ / | | | | | | | | | * commit '2899c94b9d962c308ef71ee10809c61ac39e0ce5': Switch init to epoll.
| * | Merge "Switch init to epoll."Elliott Hughes2015-04-258-87/+60
| |\ \ | | |/ | |/|
| | * Switch init to epoll.Elliott Hughes2015-04-248-87/+60
| |/ | | | | | | | | | | | | | | | | | | | | Not just because it's what the cool kids are doing --- it also lets us simplify the inner loop and decouple it from whatever systems want to be woken to perform some activity if there's data to be read on some fd. Currently this is just used to clean up the existing signal handling, keychord, and property service code. Change-Id: I4d7541a2c4386957ad877df69e3be08b96a7dec5
* | am df5d4482: Merge "Clean up property service initialization."Elliott Hughes2015-04-252-43/+27
|\ \ | |/ | | | | | | * commit 'df5d4482074fc68a25a6a33992f3fc5164c2d3ec': Clean up property service initialization.
| * Merge "Clean up property service initialization."Elliott Hughes2015-04-252-43/+27
| |\
| | * Clean up property service initialization.Elliott Hughes2015-04-242-43/+27
| |/ | | | | | | | | | | | | | | | | | | | | All the code that was being delayed does is create a socket. We can do that straight away, avoid the overhead, and simplify our main loop. The keychord fd, on the other hand, seems a little tricky. It looks like /dev/keychord isn't immediately available, at least not on N9; we have to wait for ueventd to set us up the bomb. Change-Id: I020e75b8e4b233497707f0a3cbbb6038b714161f
* | am b749be0b: Merge "Clean up init signal handling a little."Elliott Hughes2015-04-252-50/+46
|\ \ | |/ | | | | | | * commit 'b749be0bc36b3ae610aa05541581ef8cc5e484ee': Clean up init signal handling a little.
| * Merge "Clean up init signal handling a little."Elliott Hughes2015-04-252-50/+46
| |\
| | * Clean up init signal handling a little.Elliott Hughes2015-04-242-50/+46
| |/ | | | | | | | | | | | | We can set it up earlier, and error reporting like this helped me find the SELinux problem with the last change to this code. Change-Id: If0f38bc5ff0465c4030e2d39d34f31f49b2d8487
* | am 662baefb: Merge "Setup signal handler before any exec command"Elliott Hughes2015-04-251-1/+3
|\ \ | |/ | | | | | | * commit '662baefbb7ceaf2f2502f4e7752d4a6d835f216a': Setup signal handler before any exec command
| * Merge "Setup signal handler before any exec command"Elliott Hughes2015-04-251-1/+3
| |\
| | * Setup signal handler before any exec commandJohan Redestig2015-04-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes init deadlock when an exec command was called in an on-init section. The exec command handling relies on that the signal handler mechanism is working to know when to continue executing commands. Change-Id: Ib0ce75ffad7cf3bf926c93d0506b2fe3e5a92630
* | | am 05c92d2b: Merge "liblog: Add BM_is_loggable benchmark"Mark Salyzyn2015-04-241-0/+14
|\ \ \ | |/ / | | | | | | | | | * commit '05c92d2b4fa7e96f6e64384f197e12916ed1d821': liblog: Add BM_is_loggable benchmark
| * | Merge "liblog: Add BM_is_loggable benchmark"Mark Salyzyn2015-04-241-0/+14
| |\ \
| | * | liblog: Add BM_is_loggable benchmarkMark Salyzyn2015-04-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - On a N9 64-bit benchmark, the __android_log_is_loggable overhead is roughly 500ns (1/2 of a syscall?) Bug: 19544788 Bug: 17760225 Bug: 20416721 Change-Id: Ib9e4d06d96e1b19ca5d459e569ead451ef47a9c0
* | | | am a5669861: Merge "Revert "Revert "Remove now-unusable \'setcon\' command."""Elliott Hughes2015-04-244-17/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a5669861c1abd023aa708d21e6f9d7f2c8803903': Revert "Revert "Remove now-unusable 'setcon' command.""
| * | | Merge "Revert "Revert "Remove now-unusable 'setcon' command."""Elliott Hughes2015-04-244-17/+0
| |\ \ \
| | * | | Revert "Revert "Remove now-unusable 'setcon' command.""Elliott Hughes2015-04-244-17/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b862bd00a4192d48c3ae82156d8c35b32283e9e4. This change was fine but an earlier change it depended on was broken. That change has been fixed and resubmitted. Bug: http://b/19702273 Change-Id: I17e565721026e48e2a73526f729f2481d4d6edb5
* | | | am 132440b0: Merge "Revert "Revert "Make init re-exec itself for its SELinux ↵Elliott Hughes2015-04-242-21/+45
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | domain transition.""" * commit '132440b087d35ebddd021b86bdcb3aa5c8feec80': Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
| * | | Merge "Revert "Revert "Make init re-exec itself for its SELinux domain ↵Elliott Hughes2015-04-242-21/+45
| |\ \ \ | | | | | | | | | | | | | | | transition."""
| | * | | Revert "Revert "Make init re-exec itself for its SELinux domain transition.""Elliott Hughes2015-04-242-21/+45
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4217374611ada50f33aee544f015f6f9dfbf7ced. It turns out that the kernel passes any unrecognized arguments on to init, and (at least) N6 and N9 have such arguments. My lazy check of argc was thus insufficient to recognize what stage of init we were in, so we'd skip to stage 2 and not set up SELinux. And apparently you can get a very long way with SELinux off... We'll fix that in a later change. Bug: 19702273 Change-Id: I43b3fb722fed35dd217cb529cbcac9a29aff4e4b
* | | | am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot ↵Elliott Hughes2015-04-241-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | failures." * commit '34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72': Improve bad error reporting seen in shamu SELinux boot failures.
| * | | Merge "Improve bad error reporting seen in shamu SELinux boot failures."Elliott Hughes2015-04-241-1/+4
| |\ \ \
| | * | | Improve bad error reporting seen in shamu SELinux boot failures.Elliott Hughes2015-04-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain why mount failed, and explicitly say that the umount fixed it. Change-Id: I13b0927a36517f2fc9f9580945ba6ebefc4882df
* | | | | am 10936d1f: Merge "init: consider all platform devices for ↵Tom Cherry2015-04-241-10/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | find_platform_device" * commit '10936d1fdb639c91ed9062b92909d9928e6b69ea': init: consider all platform devices for find_platform_device
| * | | | Merge "init: consider all platform devices for find_platform_device"Tom Cherry2015-04-241-10/+0
| |\ \ \ \
| | * | | | init: consider all platform devices for find_platform_deviceTom Cherry2015-04-231-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain platforms list their platform devices with a path other than the current /devices or /devices/platform. Additionally, sometimes these paths are a platform device themselves. An example are devices with a path /devices/soc.0/... where /devices/soc.0 is also a platform devices. Instead of continuing to special case these path prefixes, we can consider the entire path, given that no mmc or usb devices create platform devices as subdevices, which they should not by their very nature. This keeps the symlinks for block devices named identically for current platform devices and places them in /dev/block/<full path to device> for devices in locations other than /devices or /devices/platform, eg /dev/block/platform/soc.0/7824900.sdhci This keeps the symlinks for character deviced named identically for all cases. Change-Id: Ifc8eedf1086db1826dbc8f7e96cdfcfa5da876b3
* | | | | | am 46fee19c: Merge "Revert "Make init re-exec itself for its SELinux domain ↵Nick Kralevich2015-04-242-45/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transition."" * commit '46fee19cb27dd24a58bbcad608058f25ca7b3e52': Revert "Make init re-exec itself for its SELinux domain transition."
| * | | | | Merge "Revert "Make init re-exec itself for its SELinux domain transition.""Nick Kralevich2015-04-242-45/+21
| |\ \ \ \ \
| | * | | | | Revert "Make init re-exec itself for its SELinux domain transition."Nick Kralevich2015-04-242-45/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shamu isn't booting. This reverts commit adf0d1bbfa4bc560c2106f14afa8258a11c48bf6. Change-Id: I89d568838cebbe14cc4a8ae3843f0f1ac54987af
* | | | | | | am f0b47920: Merge "Revert "Remove now-unusable \'setcon\' command.""Nick Kralevich2015-04-244-0/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f0b4792017b338ac6397e9809f3629c33ef94c2d': Revert "Remove now-unusable 'setcon' command."
| * | | | | | Merge "Revert "Remove now-unusable 'setcon' command.""Nick Kralevich2015-04-244-0/+17
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Revert "Remove now-unusable 'setcon' command."Nick Kralevich2015-04-244-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily revert because device isn't booting. This reverts commit 7b15ac99f3bfef33c82ea109487c99a77b41ebfb. Change-Id: Ice986bac62e20c70f7bedf1744a617b97392ae8c
* | | | | | | am 659b7d63: Merge "Remove now-unusable \'setcon\' command."Elliott Hughes2015-04-244-17/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '659b7d633a03a03674f82f02f567ac5ff18fba41': Remove now-unusable 'setcon' command.
| * | | | | | Merge "Remove now-unusable 'setcon' command."Elliott Hughes2015-04-244-17/+0
| |\ \ \ \ \ \ | | |/ / / / /
generated by cgit v1.1 at 2025-10-16 21:49:37 +0000