summaryrefslogtreecommitdiffstats
path: root/init
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
* | | am b470d404: am b988e95c: am 6fec3a23: Merge "Log a warning on services that ↵Nick Kralevich2013-12-101-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | lack SELinux domains." * commit 'b470d404e58bbe89c5c2822120b220e45ff72b42': Log a warning on services that lack SELinux domains.
| * | Log a warning on services that lack SELinux domains.Stephen Smalley2013-12-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Sample output on flo: <3>[ 7.270568] init: Warning! Service irsc_util needs a SELinux domain defined; please fix! <3>[ 8.290832] init: Warning! Service bootanim needs a SELinux domain defined; please fix! Change-Id: If5514b188517917d58ee81c446af563b0443be45 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | am 5ebd8e43: am b2406973: Merge changes I727d9135,I3bd1b59d,I0d05aa28Greg Hackmann2013-11-275-24/+273
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit '5ebd8e43ba992d12fcdac4aedf7da51b50d6b949': rootdir: add ueventd.rc rule for adf subsystem init: add subsystem rules to ueventd.rc init: handle ueventd path truncation better
| * | init: add subsystem rules to ueventd.rcGreg Hackmann2013-11-265-33/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | init: handle ueventd path truncation betterGreg Hackmann2013-11-261-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | am 675c9966: am 0914e01e: Merge "init: limit visibility of init_parser.c ↵Greg Hackmann2013-11-272-6/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | helpers" * commit '675c996651e0513e9c7b657d356c55f9b05c7c9f': init: limit visibility of init_parser.c helpers
| * | Merge "init: limit visibility of init_parser.c helpers"Greg Hackmann2013-11-262-6/+5
| |\ \
| | * | init: limit visibility of init_parser.c helpersGreg Hackmann2013-11-252-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent clashing with forthcoming changes to uevent_parser.c Change-Id: I2ee183261c7f43e0e4104a16a280c7ee73d7df96 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am 8bda6ce5: am 121400a4: Merge "Make init distinguish between orderly exit ↵Elliott Hughes2013-11-271-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | and being killed by signals." * commit '8bda6ce55700e46760f8d59820406b72964fa171': Make init distinguish between orderly exit and being killed by signals.
| * | | Make init distinguish between orderly exit and being killed by signals.Elliott Hughes2013-11-251-1/+9
| |/ / | | | | | | | | | | | | Bug: 11826724 Change-Id: I7c11f602447dbd6862decc51cdfe883003cf7d67
| * | Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEADThe Android Open Source Project2013-11-226-6/+184
| |\ \ | | |/ | |/| | | | Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
* | | am 308f0f9b: am 95e69261: am ac568b8f: Merge "init: remove obsolete rle logo"JP Abgrall2013-10-174-190/+21
|\ \ \ | | | | | | | | | | | | | | | | * commit '308f0f9bf2a82d9c1e02982f0e177f6b04545210': init: remove obsolete rle logo
| * \ \ am 95e69261: am ac568b8f: Merge "init: remove obsolete rle logo"JP Abgrall2013-10-174-190/+21
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit '95e69261b22cd57c795e96e5ac122f120113f819': init: remove obsolete rle logo
| | * init: remove obsolete rle logoMarcin Chojnacki2013-10-164-190/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Obsolete RLE 565 logo is used nowhere, because 565 framebuffer isn't used for years. It's not necessary to keep this thing alive anymore. Change-Id: Ie61e168790f791230530cd3eb1c68b1f7344c9a7
* | | am aa4051dc: am 2f924ebe: am a94d2b39: Merge "Add a restorecon_recursive ↵Nick Kralevich2013-10-104-3/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | built-in command to init." * commit 'aa4051dc4f90f987ba05269ce396d676571156e0': Add a restorecon_recursive built-in command to init.
| * | am 2f924ebe: am a94d2b39: Merge "Add a restorecon_recursive built-in command ↵Nick Kralevich2013-10-104-3/+24
| |\ \ | | |/ | | | | | | | | | | | | | | | to init." * commit '2f924ebe0b0891dba1996c246839427b23705018': Add a restorecon_recursive built-in command to init.
| | * Add a restorecon_recursive built-in command to init.Stephen Smalley2013-10-104-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functionally equivalent to the restorecon -R toolbox command. A use case is given by: I48eaa2b9901ac8c978192c14493ba1058a089423 Also, fix error handling and documentation for restorecon command. Change-Id: Ia7fbcc82645baf52c6bff0490d3492f458881cbb Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | am 4820022b: am 0b7d588d: am f2c4c4ad: Merge "init: Fix ↵Benoit Goby2013-09-241-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | queue_all_property_triggers with nonexistent properties" * commit '4820022b5edb0d19e268d836c25aa628b4378aba': init: Fix queue_all_property_triggers with nonexistent properties
| * | am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with ↵Benoit Goby2013-09-241-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | nonexistent properties" * commit '0b7d588d531691904530ba57d772b31fb24ed343': init: Fix queue_all_property_triggers with nonexistent properties
| | * init: Fix queue_all_property_triggers with nonexistent propertiesBenoit Goby2013-09-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't queue actions for "on property=*" if the property does not exist. This fixes these errors on boot: init: property 'sys.powerctl' doesn't exist while expanding '${sys.powerctl}' init: powerctl: cannot expand '${sys.powerctl} Change-Id: I3bd354d73a860f856be5df2c654f940445f9efd9