summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Expand)AuthorAgeFilesLines
* am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verif...Sami Tolvanen2015-04-071-20/+117
|\
| * 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
* | | am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified...Sami Tolvanen2015-04-072-31/+37
|\ \ \ | |/ /
| * | 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
* | | Merge "Revert "Revert "Adding e4crypt support"""Paul Lawrence2015-04-024-27/+102
|\ \ \
| * | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-04-014-27/+102
* | | | am 1c4cdf72: am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr."Dan Albert2015-04-021-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Link libc++_static into fs_mgr.Dan Albert2015-04-011-0/+1
| * | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-03-314-27/+102
| |/
* | am 825c2655: am 6ca1dbd4: am 6baab44e: Merge "Fix build"Sami Tolvanen2015-03-261-15/+14
|\ \ | |/
| * Fix buildSami Tolvanen2015-03-261-15/+14
* | am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verit...Sami Tolvanen2015-03-263-63/+197
|\ \ | |/
| * Use structured format for verity metadataSami Tolvanen2015-03-243-63/+197
* | Revert "Adding e4crypt support"Paul Lawrence2015-03-264-104/+30
* | Adding e4crypt supportPaul Lawrence2015-03-234-30/+104
* | am 54bac178: am ddd0639e: Merge "Add init command to set verified properties"Sami Tolvanen2015-03-202-7/+20
|\ \ | |/
| * Add init command to set verified propertiesSami Tolvanen2015-03-192-7/+20
* | am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init t...Sami Tolvanen2015-03-111-27/+1
|\ \ | |/
| * 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
* | | fs_mgr: recognize a notrim mountpoint flagJP Abgrall2015-03-053-0/+8
|/ /
* | am 291ce5b8: Merge "Fs_mgr: Fix format code"Andreas Gampe2015-03-041-1/+1
|\ \ | |/
| * Fs_mgr: Fix format codeAndreas Gampe2015-03-041-1/+1
* | am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"Sami Tolvanen2015-03-042-10/+343
|\ \ | |/
| * 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
* | | am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"Sami Tolvanen2015-02-283-6/+14
|\ \ \ | |/ /
| * | Set underlying block device RO when enabling veritySami Tolvanen2015-02-273-6/+14
| |/
* | Merge commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31' into HEADBill Yi2015-02-194-11/+8
|\ \ | |/ |/|
| * am 317b4024: Revert "Make encryption configurable"Paul Lawrence2015-02-073-7/+3
| |\
| | * Revert "Make encryption configurable"Paul Lawrence2015-02-063-7/+3
| * | am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic"Nick Kralevich2015-02-062-3/+14
| |\ \
| * \ \ am bda62724: Make encryption configurablePaul Lawrence2015-01-263-3/+7
| |\ \ \ | | | |/ | | |/|
| | * | Make encryption configurablePaul Lawrence2015-01-213-3/+7
| * | | am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"Elliott Hughes2015-01-231-0/+91
| |\ \ \
| * \ \ \ am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""Elliott Hughes2015-01-231-91/+0
| |\ \ \ \
| * \ \ \ \ am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"JP Abgrall2015-01-231-0/+91
| |\ \ \ \ \
| * \ \ \ \ \ am f2bd3fdd: Merge "Provide a way to select force encryption from vendor part...Leo Wang2015-01-091-1/+12
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Provide a way to select force encryption from vendor partitionPaul Lawrence2015-01-071-1/+12
| * | | | | | am a97c1075: Merge "Fix Nick\'s nits"Elliott Hughes2014-12-101-4/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 294e610f: Merge "Fix verity on system partitions larger than 2G"Elliott Hughes2014-12-101-3/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aospElliott Hughes2014-12-091-11/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-141-1/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-131-1/+3
| * | | | | | | | | am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-141-3/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-131-3/+3
| * | | | | | | | | fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-121-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-081-1/+2
generated by cgit v1.1 at 2024-12-23 07:45:42 +0000