summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE Securely encrypt the master keyPaul Lawrence2015-05-291-11/+1
| | | | | | | | | | | | | | | | | | | | | | (chery-picked from commit 806d10be2336f32cdca16c2540cbf3d548f2fec7) Move all key management into vold Reuse vold's existing key management through the crypto footer to manage the device wide keys. Use ro.crypto.type flag to determine crypto type, which prevents any issues when running in block encrypted mode, as well as speeding up boot in block or no encryption. This is one of four changes to enable this functionality: https://android-review.googlesource.com/#/c/148586/ https://android-review.googlesource.com/#/c/148604/ https://android-review.googlesource.com/#/c/148606/ https://android-review.googlesource.com/#/c/148607/ Bug: 18151196 Change-Id: I6a8a18f43ae837e330e2785bd26c2c306ae1816b
* Don't use TEMP_FAILURE_RETRY on close in system/core.Elliott Hughes2015-05-272-10/+10
| | | | | | Bug: http://b/20501816 Change-Id: I1839b48ee4f891b8431ecb809e37a4566a5b3e50 (cherry picked from commit 47b0134ec2b5e8c8b5b5671cd4a3e41261275532)
* am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to ↵Iliyan Malchev2015-05-131-1/+21
|\ | | | | | | | | | | | | be specified as percentage of total memory" into lmp-mr1-dev * commit '2557cd21f0af31d6dafee24d649f83314d2896d4': fs_mgr: allow for zramsize to be specified as percentage of total memory
| * am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified ↵Iliyan Malchev2015-05-121-1/+21
| |\ | | | | | | | | | | | | | | | | | | as percentage of total memory" into lmp-mr1-dev * commit '8b4486294053ea96ac50d8c07d4fc23729ef7c52': fs_mgr: allow for zramsize to be specified as percentage of total memory
| | * Merge "fs_mgr: allow for zramsize to be specified as percentage of total ↵Iliyan Malchev2015-05-121-1/+21
| | |\ | | | | | | | | | | | | memory" into lmp-mr1-dev
| | | * fs_mgr: allow for zramsize to be specified as percentage of total memoryIliyan Malchev2015-05-011-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the zramsize entry has a % size at the end, as in the following example: /dev/block/zram0 none swap defaults zramsize=25% then we will set the value as that percentage of total RAM, as read by scanning /proc/meminfo. b/20760266 Seed common build allocated too much for zRAM-backed swap Change-Id: I17c91d311ba99ae7adae112bfe1b38542ea69b80 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | am 92f075aa: am 48ba7587: am 34dd04db: Merge "Improve bad error reporting ↵Elliott Hughes2015-04-241-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | seen in shamu SELinux boot failures." * commit '92f075aa08a2665ad03c80a0408667f8864f1ecd': Improve bad error reporting seen in shamu SELinux boot failures.
| * | | am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu ↵Elliott Hughes2015-04-241-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SELinux boot failures." * commit '48ba758782bed8c50f450fd77c4b3284c3fa7316': Improve bad error reporting seen in shamu SELinux boot failures.
| | * | | 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
* | | | | resolved conflicts for merge of d0b6de41 to masterEd Tam2015-04-136-5/+171
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I1d1f6b1cdbd7ee441682c4258a11fb3198ca7d94
| * | | | resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aospEd Tam2015-04-136-5/+171
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280
| | * | fs_mgr: introduce fs_mgr_format to format wiped partitionsChris Fries2015-04-106-3/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move fastboot's format logic into fs_mgr, to consolidate the knowledge about how to do this (and when to wipe metadata). Try to format these formattable paritions if they are wiped. If formatting fails, we will fall out to let recovery mode handle it. Bug: 20082763 Change-Id: I397cc197550e78d932e8a154fd234695c46dbe7b
* | | | am d087e6f3: am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: ↵Mohamad Ayyash2015-04-092-27/+54
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Add support for squashfs""" * commit 'd087e6f3ff0f928fb1ad7e47e488a3345ab8a555': Revert "Revert "fs_mgr_verity: Add support for squashfs""
| * | | Revert "Revert "fs_mgr_verity: Add support for squashfs""Mohamad Ayyash2015-04-082-27/+54
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7b97c7a3fa0f1bdae5b45a70f625ff48f9dab0c1. Change-Id: Id47e70479fe9247b7936f2e54d4dbfbb4f63f635
* | | | am 0009bacf: am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add ↵Mohamad Ayyash2015-04-082-39/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | support for squashfs"" * commit '0009bacfda1f6b6a7421c3d1d7a07cc8c88c2090': Revert "fs_mgr_verity: Add support for squashfs"
| * | | Merge "Revert "fs_mgr_verity: Add support for squashfs""Mohamad Ayyash2015-04-082-39/+26
| |\ \ \
| | * | | Revert "fs_mgr_verity: Add support for squashfs"Mohamad Ayyash2015-04-082-39/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 807f47004f03653997edbe3c83d46350cb056cd4. Change-Id: I2d7972c0828c842b44747dd08fbe44668f2a55db
* | | | | am d411d14a: am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for ↵Mohamad Ayyash2015-04-082-26/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | squashfs" * commit 'd411d14a07842563500cb8991f0f8a84fcb1cd8f': fs_mgr_verity: Add support for squashfs
| * | | | Merge "fs_mgr_verity: Add support for squashfs"Mohamad Ayyash2015-04-082-26/+39
| |\ \ \ \ | | |/ / /
| | * | | fs_mgr_verity: Add support for squashfsMohamad Ayyash2015-04-062-26/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cleanup the code to get filesystem size in a block device - Add support to reading size of squashfs in a block device Change-Id: I3848a705ed4dc2fc9afad20331f0fdecfee545c5 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | | | | am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when ↵Sami Tolvanen2015-04-071-20/+117
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | verified partition is reflashed" * commit '13e8af053b425b66199dc12b89c02236b517fac9': Restore verity state when verified partition is reflashed
| * | | | Merge "Restore verity state when verified partition is reflashed"Sami Tolvanen2015-04-071-20/+117
| |\ \ \ \
| | * | | | Restore verity state when verified partition is reflashedSami Tolvanen2015-03-311-20/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store verity state separately for each verified partition, and store a hash of the last verity table signature for each partition. If the signature changes, assume the partition has been reflashed and reset verity state. Bug: 20006638 Change-Id: I1c85fb816bfec1a54b1033c938bf1fdaf572f849
* | | | | | am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the ↵Sami Tolvanen2015-04-072-31/+37
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verified property value" * commit '93c4b6c85ac4350029e1a78c16663f61c777ac14': Set verity mode as the verified property value
| * | | | | Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-072-31/+37
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Set verity mode as the verified property valueSami Tolvanen2015-03-312-31/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the verity mode as the value for partition.%s.verified to make it easier for userspace to determine in which mode dm-verity was started. Change-Id: Icc635515f8a8ede941277aed196867351d8387cb
* | | | | Merge "Revert "Revert "Adding e4crypt support"""Paul Lawrence2015-04-024-27/+102
|\ \ \ \ \
| * | | | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-04-014-27/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build break caused by original change This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5. (cherry picked from commit bbb4c85bdcc9a1bce315ed9d61a228bb1b992a1c) Change-Id: If0ead0f2656b69f33f72c64b03a05784455a4143
* | | | | | am 1c4cdf72: am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr."Dan Albert2015-04-021-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '1c4cdf72a685fe2b913244991b79a81a0d1c2620': Link libc++_static into fs_mgr.
| * | | | Link libc++_static into fs_mgr.Dan Albert2015-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic2461d3a30dbd8a22f9800a33fac27c658340b21
| * | | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-03-314-27/+102
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build break caused by original change This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5. Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
* | | | am 825c2655: am 6ca1dbd4: am 6baab44e: Merge "Fix build"Sami Tolvanen2015-03-261-15/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '825c2655b7bbd5f88d316a5a9b3a746c50282c24': Fix build
| * | | Fix buildSami Tolvanen2015-03-261-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build breakage in aosp_fugu-userdebug_clang (linux) caused by Id8711f7d51dc1e4e9a4d84f9951240f64528e69d Change-Id: Icd04aeaf131be045cf5788846ae9832e6cbbb944
* | | | am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for ↵Sami Tolvanen2015-03-263-63/+197
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | verity metadata" * commit 'c28e2598af394834dbf6532f1cf252705fabd76b': Use structured format for verity metadata
| * | | Use structured format for verity metadataSami Tolvanen2015-03-243-63/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify the location of verity metadata in fstab, and use a type-length-value format for the metadata that allows other data to be stored in the same location in an extensible way. Change-Id: Id8711f7d51dc1e4e9a4d84f9951240f64528e69d
* | | | Revert "Adding e4crypt support"Paul Lawrence2015-03-264-104/+30
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6095afc115fe3a4b7d151b4fcc164e00f9df9659. Change-Id: Icedfe0036223d7f42eaaefc4a35ad0f2efb14e4e
* | | | Adding e4crypt supportPaul Lawrence2015-03-234-30/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add file encryption flag to fstab. If file encryption flag set in fstab, handle identically to block encrypted volumes. Requires matching change: https://googleplex-android-review.git.corp.google.com/#/c/642778/ Change-Id: I28c236959f2d7d5f0dccc8ea45c325ea0cf871fc
* | | | am 54bac178: am ddd0639e: Merge "Add init command to set verified properties"Sami Tolvanen2015-03-202-7/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '54bac178ce0ee9d243bfbfc9c18dafbb14cd3f92': Add init command to set verified properties
| * | | Add init command to set verified propertiesSami Tolvanen2015-03-192-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a command that updates dm-verity state and sets partition.%.verified properties used by adb remount. This is needed in init since fs_mgr cannot set properties: I6a28cccb1ccce960841af20a4b20c32d424b5524 Change-Id: I0fdf5bc29c56690dcadff9d0eb216d3c68483538
* | | | am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init ↵Sami Tolvanen2015-03-111-27/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | through libfs_mgr" * commit 'fcd14f13a1e05bc1958bfeaba95678b9bf4b121e': Do not call libcutils property_set in init through libfs_mgr
| * | | Merge "Do not call libcutils property_set in init through libfs_mgr"Sami Tolvanen2015-03-111-27/+1
| |\ \ \
| | * | | Do not call libcutils property_set in init through libfs_mgrSami Tolvanen2015-03-051-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both init and libcutils define a property_set function. The init version sets the property directly while libcutils simply calls __system_property_set, which sends a message to init to set the property. Since libfs_mgr is statically linked to libcutils, any calls to property_set end up sending a message to init and waiting for a response. When libfs_mgr is further statically linked to init, this leads to init sending a message to itself when property_set is called in fs_mgr. Because send_prop_msg in bionic only waits for a response for 250ms, this does not cause a deadlock. However, using libcutils to set a property in the init process is hardly a good idea. This change removes the property_set call from fs_mgr_verity.c. If this property is required later, it should be set elsewhere. Change-Id: I6a28cccb1ccce960841af20a4b20c32d424b5524
* | | | | fs_mgr: recognize a notrim mountpoint flagJP Abgrall2015-03-053-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some partitions don't need trimming. Needs a vold:fstrim change Bug: 19624276 Change-Id: I8df715bd18688d7921afa2f3743f7d2a68760699
* | | | am 291ce5b8: Merge "Fs_mgr: Fix format code"Andreas Gampe2015-03-041-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '291ce5b82d8a504be69132f1827e20041833c488': Fs_mgr: Fix format code
| * | | Fs_mgr: Fix format codeAndreas Gampe2015-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested printing for off_t is to cast to intmax_t and print that. Follow-up to https://android-review.googlesource.com/133111. Change-Id: Icff6844044c3d0fa6372c3f399453a526fd89954
* | | | am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"Sami Tolvanen2015-03-042-10/+343
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a88fb24ab43eec9710a0d4d15aedb6d4bc51a2ec': Add fs_mgr support for dm-verity modes
| * | | Merge "Add fs_mgr support for dm-verity modes"Sami Tolvanen2015-03-042-10/+343
| |\ \ \
| | * | | Add fs_mgr support for dm-verity modesSami Tolvanen2015-03-042-10/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for dm-verity modes and storing persistent state in a location specified by the following properties: ro.verity.state.location ro.verity.state.offset If these properties do not exist, dm-verity is always loaded in EIO mode. If the properties do exist, but the location does not have valid state data, dm-verity is loaded in RESTART mode. The mode is updated to LOGGING if a dm-verity triggered restart has occurred. Change-Id: Ibb82953594d234f81ad21c40f524190b88e4ac8f
* | | | | am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"Sami Tolvanen2015-02-283-6/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fbb3f8ca499b04c82437155f87c8666cad607c6b': Set underlying block device RO when enabling verity
| * | | | Set underlying block device RO when enabling veritySami Tolvanen2015-02-273-6/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when verity is set up on a block device, the underlying device is still accessible directly. Change the existing function fs_set_blk_ro visible to other fs_mgr modules, change the behavior to match the comment above the function definition, and call it to disable write access to the block device when setting up verity. Bug: 18609347 Change-Id: I7884175df15f9161174788d74d20a08e4cd472ca
generated by cgit v1.1 at 2025-01-10 03:55:55 +0000