summaryrefslogtreecommitdiffstats
path: root/init
Commit message (Collapse)AuthorAgeFilesLines
...
| * | am 9e3b7723: am 3fcd9ed6: Merge "ueventd: fix klog debug typo"Alex Ray2014-03-191-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '9e3b7723d43ac01f34c8b3e49e9ed8f3c84207e7': ueventd: fix klog debug typo
| | * ueventd: fix klog debug typoAlex Ray2014-03-191-2/+2
| | | | | | | | | | | | Change-Id: Ib0acece15145cc0e868452ede8f3acbab419b965
| * | am 12e3639a: am c383c6d1: Merge "Add "import" support to system property files."Colin Cross2014-03-191-22/+57
| |\ \ | | |/ | | | | | | | | | * commit '12e3639a6e1cdd77af0964e10081311430fd065c': Add "import" support to system property files.
| | * Add "import" support to system property files.Jeff Sharkey2014-03-191-22/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During boot, allow a property file to import properties from another file. Supports importing the entire file, a specific key, or any keys matching a specific prefix. Here's some example syntax: import /oem/oem.prop import /oem/oem.prop foo.* import /oem/oem.prop foo.bar Bug: 13340779 Change-Id: I867f9a10ca09684326675d9f051f5cf2ae171617
| | * don't load property_contexts from /dataNick Kralevich2014-03-111-1/+0
| | | | | | | | | | | | | | | | | | Bug: 12613118 Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13 (cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf)
* | | Merge "Add "import" support to system property files."Jeff Sharkey2014-03-191-22/+57
|\ \ \
| * | | Add "import" support to system property files.Jeff Sharkey2014-03-191-22/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During boot, allow a property file to import properties from another file. Supports importing the entire file, a specific key, or any keys matching a specific prefix. Here's some example syntax: import /oem/oem.prop import /oem/oem.prop foo.* import /oem/oem.prop foo.bar Bug: 13340779 Change-Id: I867f9a10ca09684326675d9f051f5cf2ae171617
* | | | Merge changes Ibea4c13a,I27215a3dGeremy Condra2014-03-191-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * changes: init: Add "partition.*.verified" properties to the property service. fs_mgr: Set the 'partition.*.verified' property for verified partitions.
| * | | init: Add "partition.*.verified" properties to the property service.Geremy Condra2014-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are intended to be used by the rest of the system as weak indicators that the corresponding partition is verified. For instance, if the "partition.system.verified" property is set then using `adb remount` would be unwise. These should not be used as the basis for security decisions. Change-Id: Ibea4c13abd54f46537e2a406774412c25918b24d
* | | | am 8299ff70: Merge "init: 64-bit build issue" into klp-volantis-devMark Salyzyn2014-03-171-2/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '8299ff701b66caf513e6cc8807b413bf44b8c2f6': init: 64-bit build issue
| * | init: 64-bit build issueMark Salyzyn2014-03-171-2/+3
| | | | | | | | | | | | Change-Id: Icc5344abc184adf4247175d85b2da08af4636e49
* | | am 27514f6d: am f2d09863: am 9f4d558e: Merge "ueventd: easier debug logging"Alex Ray2014-03-083-2/+11
|\ \ \ | |/ / | | | | | | | | | * commit '27514f6de9d2ad039a187e5584f296ec05a4ef18': ueventd: easier debug logging
| * | am f2d09863: am 9f4d558e: Merge "ueventd: easier debug logging"Alex Ray2014-03-083-2/+11
| |\ \ | | | | | | | | | | | | | | | | * commit 'f2d09863204fc04c7f030ce7adf51deb5de952ce': ueventd: easier debug logging
| | * \ am 9f4d558e: Merge "ueventd: easier debug logging"Alex Ray2014-03-083-2/+11
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '9f4d558e0c80602aa8707ec9d0bdd33a93aa4f16': ueventd: easier debug logging
| | | * ueventd: easier debug loggingAlex Ray2014-03-073-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move ueventd debug flag into the Android.mk. Boost klog level if event logging enabled. Change-Id: Iae48edbc43c487092c2424023576af29c76ff401
| * | | am b0eaeb42: am a69270db: Merge "liblog: enable logging to logd."Mark Salyzyn2014-02-281-2/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b0eaeb42cea7e3ee36e03ef461532b5b8556a26e': liblog: enable logging to logd.
| | * | am a69270db: Merge "liblog: enable logging to logd."Mark Salyzyn2014-02-281-2/+10
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'a69270db05cea27bf185e60af46dd46e938c7e99': liblog: enable logging to logd.
| | | * liblog: enable logging to logd.Mark Salyzyn2014-02-281-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Modify liblog to send all messages to the new syslog user space daemon. Original-Change-Id: I0ce439738cd921efb2db4c1d6a289a96bdbc8bc2 Original-Change-Id: If4eb0d09409f7e9be3eb4bb7017073dc7e931ab4 Signed-off-by: Nick Kralevich <nnk@google.com> * Add a TARGET_USES_LOGD make flag for BoardConfig.mk to manage whether logd is enabled for use or not. * rename syslog to logd to avert confusion with bionic syslog * Add fake log support back in * prefilter for logging messages from logd * Fill in timestamps at logging source * update abstract log reader * switch from using suffix for id to v3 format * log a message when creating devices that a deprecated interface is being utilized. Signed-off-by: Mark Salyzyn <salyzyn@google.com> (cherry pick from commit 099e2c1f6f706a8600c1cef74cce9066fc315480) Change-Id: I47929a5432977a1d7235267a435cec0a7d6bd440
* | | | liblog: enable logging to logd.Mark Salyzyn2014-02-271-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Modify liblog to send all messages to the new syslog user space daemon. Original-Change-Id: I0ce439738cd921efb2db4c1d6a289a96bdbc8bc2 Original-Change-Id: If4eb0d09409f7e9be3eb4bb7017073dc7e931ab4 Signed-off-by: Nick Kralevich <nnk@google.com> * Add a TARGET_USES_LOGD make flag for BoardConfig.mk to manage whether logd is enabled for use or not. * rename syslog to logd to avert confusion with bionic syslog * Add fake log support back in * prefilter for logging messages from logd * Fill in timestamps at logging source * update abstract log reader * switch from using suffix for id to v3 format * log a message when creating devices that a deprecated interface is being utilized. Signed-off-by: Mark Salyzyn <salyzyn@google.com> Change-Id: I47929a5432977a1d7235267a435cec0a7d6bd440
* | | | am c80c9dea: am 4ce33738: am d7590650: Merge "Remove an unused #include of ↵Elliott Hughes2014-02-251-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | <asm/page.h>." * commit 'c80c9dea161dc1cd951a25caa9cebdf4c12d4b64': Remove an unused #include of <asm/page.h>.
| * | | am 4ce33738: am d7590650: Merge "Remove an unused #include of <asm/page.h>."Elliott Hughes2014-02-251-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '4ce337385f1cfd54809ba78e4d1d80fbb73b2c43': Remove an unused #include of <asm/page.h>.
| | * | am d7590650: Merge "Remove an unused #include of <asm/page.h>."Elliott Hughes2014-02-251-1/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'd7590650dc7b36557efde7f63a6e904878572e12': Remove an unused #include of <asm/page.h>.
| | | * Remove an unused #include of <asm/page.h>.Elliott Hughes2014-02-241-1/+0
| | | | | | | | | | | | | | | | Change-Id: I000aead8c82ec11151f69e6ce439dd09b0f0b4f4
* | | | am f10492d8: am 066cde92: am 223e0798: Merge "Enable building init with ↵Nick Kralevich2014-02-191-2/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | -Wall -Werror." * commit 'f10492d8c0c907fad6f87c871fec6b2fac41a02c': Enable building init with -Wall -Werror.
| * | | am 066cde92: am 223e0798: Merge "Enable building init with -Wall -Werror."Nick Kralevich2014-02-191-2/+23
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '066cde92d267986424ff79f35881116da3c672f8': Enable building init with -Wall -Werror.
| | * | am 223e0798: Merge "Enable building init with -Wall -Werror."Nick Kralevich2014-02-191-2/+23
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '223e07983718e1515f2a54542b9b0163a8f508ed': Enable building init with -Wall -Werror.
| | | * Enable building init with -Wall -Werror.Stephen Smalley2014-02-191-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminates various warnings from SELinux-related code. Bug: 12587913 Change-Id: I28921f0ebd934324436609540d95ccef58552b64 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | Merge "Mount default encrypted devices at boot"Paul Lawrence2014-02-141-2/+2
|\ \ \ \
| * | | | Mount default encrypted devices at bootPaul Lawrence2014-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If userdata is default encrypted, we should mount it at boot to avoid bringing the framework up and then down unnecessarily. Needs matching vold changes from https://googleplex-android-review.googlesource.com/#/c/412649/ Bug: 8769627 Change-Id: I4b8276befd832cd788e15c36edfbf8f0e18d7e6b
* | | | | am e41420bd: am 488b5eaf: am 2e7347d6: Merge "Convert all ↵Nick Kralevich2014-02-131-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | selinux_android_restorecon and _setfilecon calls to new API." * commit 'e41420bd8cbaa69f6eaca524b2412cb92a6d18a3': Convert all selinux_android_restorecon and _setfilecon calls to new API.
| * | | am 488b5eaf: am 2e7347d6: Merge "Convert all selinux_android_restorecon and ↵Nick Kralevich2014-02-131-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | _setfilecon calls to new API." * commit '488b5eafe368781077b367a9afd68db303bc8891': Convert all selinux_android_restorecon and _setfilecon calls to new API.
| | * | am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon ↵Nick Kralevich2014-02-121-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | calls to new API." * commit '2e7347d617b02b13d227bb4cecf6bd69b7b20fa9': Convert all selinux_android_restorecon and _setfilecon calls to new API.
| | | * Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libselinux selinux_android_restorecon API is changing to the more general interface with flags and dropping the older variants. Also get rid of the old, no longer used selinux_android_setfilecon API and rename selinux_android_setfilecon2 to it as it is the only API in use. Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | am cdecfcbb: Merge "init: prevent waiting forever when a setprop is ↵JP Abgrall2014-01-311-2/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | incomplete." into klp-volantis-dev * commit 'cdecfcbb33fc3cc85ac7210ec53f6f1f90a6ffee': init: prevent waiting forever when a setprop is incomplete.
| * | | init: prevent waiting forever when a setprop is incomplete.JP Abgrall2014-01-311-2/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any app can socket_local_client_connect(s, "property_service", ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM) and just keep it open without sending anything. From then on, the property_service.c::handle_property_set_fd() will just recv() forever. This prevents any other properties (i.e. property_set("sys.powerctl", "reboot")) from being processed. Now, we just poll() for 2 sec before recv(...,MSG_DONTWAIT). Bug: 12061560 Change-Id: Iffea4ebb444c7100b59c43ed87aecc5c99f9d3e8
* | | am f2869381: am 11322efd: am acd96b11: am 12db3eb6: Merge "Move restorecon ↵Nick Kralevich2014-01-282-51/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | and restorecon_recursive code to libselinux." * commit 'f286938177390ec058ea39b308c9b9498b011c7c': Move restorecon and restorecon_recursive code to libselinux.
| * | am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to ↵Nick Kralevich2014-01-282-51/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | libselinux." * commit '12db3eb6db3b80011043e404530012612a1d0fbf': Move restorecon and restorecon_recursive code to libselinux.
| | * Move restorecon and restorecon_recursive code to libselinux.Stephen Smalley2014-01-282-51/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires telling libselinux to use the sehandle already obtained by init rather than re-acquiring it internally. init retains ownership of the sehandle because it performs the initial load, uses the sehandle for other purposes (e.g. labeling of directories created via mkdir and labeling of socket files), and handles the policy reload property trigger. Change-Id: I4a380caab7f8481c33eb64fcdb16b6cabe918ebd Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
| * | don't load property_contexts from /dataNick Kralevich2014-01-221-1/+0
| |/ | | | | | | | | | | | | | | Bug: 12613118 (cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf) Change-Id: If630478b0e3fdda8c1c14b3f41b717085acf9914
* | Merge "don't load property_contexts from /data"Nick Kralevich2014-01-191-1/+0
|\ \
| * | don't load property_contexts from /dataNick Kralevich2014-01-181-1/+0
| | | | | | | | | | | | | | | Bug: 12613118 Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
* | | Merge "resolved conflicts for merge of ec9e5891 to master"Elliott Hughes2014-01-162-4/+4
|\ \ \
| * \ \ resolved conflicts for merge of ec9e5891 to masterElliott Hughes2014-01-162-4/+4
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
| | * system/core 64-bit cleanup.Elliott Hughes2014-01-162-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up most of the size-related problems in system/core. There are still a few changes needed for a clean 64-bit build, but they look like they might require changes to things like the fastboot protocol. Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
* | | add the pre-recovery serviceDoug Zongker2014-01-161-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | Add a service called "pre-recovery" which is normally stopped but can be started by the system server when we want to go into recovery. It will do any preparation needed (currently needed to handle update packages that reside on an encrypted /data partition) and then set sys.powerctl when it's ready to actually reboot. Bug: 12188746 Change-Id: I894a4cb200395a0f6d7fe643ed4c2ac0a45d2052
* | am 5b5b1f9b: am d896c195: am 45f3ed05: am 105f6b66: Merge ↵Nick Kralevich2014-01-141-11/+34
|\ \ | |/ | | | | | | | | | | "restorecon_recursive("/sys") speed boot time" * commit '5b5b1f9b48f966942be3cda8d4ecfb7d910f12a0': restorecon_recursive("/sys") speed boot time
| * restorecon_recursive("/sys") speed boot timeNick Kralevich2014-01-101-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the restorecon_recursive("/sys") call in init.c takes approx 2 seconds on hammerhead. This change reduces the delay to 1.2 seconds. 1) Avoid double stat call when using nftw (time savings of 0.3 seconds) 2) Avoid the repeated calls to is_selinux_enabled() (time savings of 0.5 seconds) Avoid calling lsetfilecon if the file is already properly labeled. This doesn't speed up the restorecon on /sys, but it should help when handling files on /data. Bug: 11640230 Change-Id: Ie212ce4f4acade208c5676d60c1f03f50e2388a4
* | am 764daa33: am 21ff8257: am bb96da43: am 268cc540: Merge "ueventd: fix a ↵Colin Cross2013-12-302-2/+2
|\ \ | |/ | | | | | | | | | | busy loop while reading uevents" * commit '764daa33c06b5fd699bf0c8162b18dd39b00795a': ueventd: fix a busy loop while reading uevents
| * Merge "ueventd: fix a busy loop while reading uevents"Colin Cross2013-12-282-2/+2
| |\
| | * ueventd: fix a busy loop while reading ueventsAmir Goldstein2013-11-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under certain conditions, poll() may raise the POLLERR flag along with POLLIN, in which case the check for (ufd.revents == POLLIN) results in an endless busy loop. The following fix was applied to hardware/libhardware_legacy/uevent/uevent.c to fix a similar bug: commit 3aabb260ceef10377c31c9e45fb239247f5cfeba Author: Mathias Agopian <mathias@google.com> Date: Mon Oct 1 14:53:18 2012 -0700 fix a typo in uevent_next_eventi Bug: 7114973 Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2 Applying the same fix for two more poll loops in init and ueventd. Change-Id: I50693f6d3c904992ac4b8a9a14a83c7106e6b9e0
generated by cgit v1.1 at 2025-02-03 06:53:34 +0000