summaryrefslogtreecommitdiffstats
path: root/init
Commit message (Collapse)AuthorAgeFilesLines
* am 38fd5650: am 82015d4f: Merge "Only allow disabling SELinux on userdebug / ↵Nick Kralevich2014-06-032-1/+5
|\ | | | | | | | | | | | | eng builds" * commit '38fd5650ea03b1f47ead2a12a655298ef2f70a91': Only allow disabling SELinux on userdebug / eng builds
| * Only allow disabling SELinux on userdebug / eng buildsNick Kralevich2014-06-022-1/+5
| | | | | | | | | | | | | | | | Only parse and honor the kernel command line on userdebug or eng builds. On user builds, assume that selinux is always enabled and enforcing. Change-Id: I71c66e4365bdf2f226800634126a38b716d96599
* | am 4f04439f: am 6fb92bd8: am 252b0e2b: Merge "SELinux changes to check ↵Nick Kralevich2014-05-311-8/+5
|\ \ | |/ | | | | | | | | | | policy versions during a reload." * commit '4f04439f0eab481d1b7938e78d8ee316dda4d641': SELinux changes to check policy versions during a reload.
| * Merge "SELinux changes to check policy versions during a reload."Nick Kralevich2014-05-311-8/+5
| |\
| | * SELinux changes to check policy versions during a reload.Robert Craig2014-04-281-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deciding on which property_contexts policy to load during a reload, an initial call is made to libselinux to grab the correct policy index. This policy index represents whether the /data/security or the rootfs version will be used. Change-Id: I4716039bb0f5ba1e961977a18350347a67969dca Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | am c34598aa: am 55c3401b: am 08befc3a: Merge "ueventd: support by-name ↵Colin Cross2014-05-221-6/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | symlinks for PCI block devices" * commit 'c34598aa657121ed2feafdae35032e72aa1c9a80': ueventd: support by-name symlinks for PCI block devices
| * | Merge "ueventd: support by-name symlinks for PCI block devices"Colin Cross2014-05-221-6/+44
| |\ \
| | * | ueventd: support by-name symlinks for PCI block devicesAndrew Boie2014-05-131-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure that well-crafted removable media can't spoof the internal partitions, for platform devices the controller id is inside the generated path. We now do the same for PCI devices. The generated path has two levels; the PCI domain/bus, and then the peripheral ID. This lets us get by-name symlinks for PCI media, such as the SATA controllers on PC-like hardware. The symlinks will be created under /dev/block/pci/. For example: /dev/block/pci/pci0000:00/0000:00:1f.2/by-name/ Change-Id: Icee3e86bef5569c2bbd94c26bc00d49028345e3b Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | am 7bbfb8cb: am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes ↵Elliott Hughes2014-05-221-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | of <sys/atomics.h>." * commit '7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b': Remove unnecessary #includes of <sys/atomics.h>.
| * | | Remove unnecessary #includes of <sys/atomics.h>.Elliott Hughes2014-05-221-1/+0
| | | | | | | | | | | | | | | | | | | | Bug: 14903517 Change-Id: I5b0a418dd982f1a2fd90609b12bd8364f7f34996
* | | | am f6309600: am 3277dc26: am 2d03a498: Merge "correct the setenv option ↵Colin Cross2014-05-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | judging condition" * commit 'f630960088b2fbdb7f147bf9f7a137850df4c89c': correct the setenv option judging condition
| * | | correct the setenv option judging conditionGavin.Chang2014-05-161-1/+1
| | | | | | | | | | | | | | | | Change-Id: I10ed6275374f572da639f26611f607bf7607905c
* | | | am 88a98149: am 13ee94c5: am 8b2d46a5: Merge "init: logd: Allow Developer ↵Mark Salyzyn2014-05-161-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | settings to adjust logd size" * commit '88a981497ac06046d6da8a99ba17136aa8361b34': init: logd: Allow Developer settings to adjust logd size
| * | | Merge "init: logd: Allow Developer settings to adjust logd size"Mark Salyzyn2014-05-161-0/+1
| |\ \ \
| | * | | init: logd: Allow Developer settings to adjust logd sizeMark Salyzyn2014-05-131-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AID_SYSTEM can set persist.logd.size - AID_SYSTEM can issue command to /dev/socket/logd to change the runtime global log sizes. - Add support for ro.logd.size.* as populated by BoardConfig.mk - Limit size to maximum ~3% of physical memory. Bug: 14563261 Bug: 14627052 Change-Id: I606420db2e9d9d032296e71149e4a5b20cbd1137
* | | | am 7c633e6f: am 233bbd9d: am ed02fbf0: Merge "Clean up some unnecessary ↵Elliott Hughes2014-05-152-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | system_properties cruft." * commit '7c633e6fe6f69006ca4299a475230dd583da38f3': Clean up some unnecessary system_properties cruft.
| * | | Clean up some unnecessary system_properties cruft.Elliott Hughes2014-05-142-3/+0
| |/ / | | | | | | | | | | | | Bug: 14970171 Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
* | | am d96f05d2: am a7bf5bd1: am 3c049bbe: Merge "init: add \'enable <service>\' ↵JP Abgrall2014-05-036-2/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | to negate "service <service>... disabled"" * commit 'd96f05d2a7881dbb18fc86b765a67066560b7a1a': init: add 'enable <service>' to negate "service <service>... disabled"
| * | init: add 'enable <service>' to negate "service <service>... disabled"JP Abgrall2014-05-036-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable <servicename> Turns a disabled service into an enabled one as if the service did not specify disabled in the rc file. It will also start the service if needed. Bug: 14472973 Change-Id: Id0b49cc687a2bc74f6f92e066c617724cc94908d Signed-off-by: JP Abgrall <jpa@google.com>
| * | init: 64-bit build issueMark Salyzyn2014-05-011-1/+2
| | | | | | | | | | | | | | | | | | (cherry pick from Icc5344abc184adf4247175d85b2da08af4636e49) Change-Id: I88b0c9b20720ac62ebae8359ded4ab77b4ebcdde
* | | am 57569b3d: am 1abf4918: am c7580819: Merge "ueventd: Ueventd changes the ↵Ruchi Kandoi2014-05-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | permission of sysfs files for max/min cpufreq" * commit '57569b3d3cea0b2096a15e8d25b41df9f836fd08': ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
| * | ueventd: Ueventd changes the permission of sysfs files for max/minRuchi Kandoi2014-05-011-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | cpufreq The owner and permissions for the sysfs file /sys/devices/system/cpu*/cpufreq/scaling_max/min_freq is changed. This would allow the PowerHAL to change the max/min cpufreq even after the associated CPU's are hotplugged out and back in. Change-Id: Ibe0b4aaf3db555ed48e89a7fcd0c5fd3a18cf233 Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
* | Let system UID define build fingerprint.Jeff Sharkey2014-04-281-0/+1
| | | | | | | | | | | | | | | | Some devices leave "ro.build.fingerprint" undefined at build time, since they need to build it from the components at runtime. Bug: 13340779 Change-Id: I033ff7600e68edffdea101fec30246135646b4b2
* | am 4726ba24: am 40d49a02: am e99e5474: Merge "Sync persist property ↵Colin Cross2014-04-181-0/+1
|\ \ | |/ | | | | | | | | | | immediately,in case of suddenly remove the battery." * commit '4726ba24087e83c841e0d0058df61dc908f01978': Sync persist property immediately,in case of suddenly remove the battery.
| * Merge "Sync persist property immediately,in case of suddenly remove the ↵Colin Cross2014-04-181-0/+1
| |\ | | | | | | | | | battery."
| | * Sync persist property immediately,in case of suddenly remove the battery.OPPO2014-03-311-0/+1
| | | | | | | | | Change-Id: I83c5812c69db532f4675f5dbfa508e55999c8dfe
* | | am 022fa5cc: am 7f92f390: am 5b0ad963: Merge "init: unused paramter warning ↵Mark Salyzyn2014-04-021-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | messages" * commit '022fa5cc85f80f828c203f344617365d867b9137': init: unused paramter warning messages
| * | init: unused paramter warning messagesMark Salyzyn2014-04-011-0/+2
| |/ | | | | | | Change-Id: I1667371106be4b230ac3850e9819e4549eea2973
* | Auto-encrypt drive at startupPaul Lawrence2014-03-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Modify fs_mgr to unmount encryptable drives after test mounting them and then trigger an auto-encrypt via the init script Needs matching vold changes from https://googleplex-android-review.googlesource.com/#/c/414200/ Feature is limited to list of serial numbers with this change Bug: 11985952 Change-Id: I84f85a258b6a7e9809467c9149249302e203c41b
* | am 18ad82e0: am 9e3b7723: am 3fcd9ed6: Merge "ueventd: fix klog debug typo"Alex Ray2014-03-191-2/+2
|\ \ | | | | | | | | | | | | * commit '18ad82e03a3b7ae54a246085c10b7b0815ea4e32': ueventd: fix klog debug typo
| * \ 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>.