summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Expand)AuthorAgeFilesLines
* am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic"Nick Kralevich2015-02-062-3/+14
|\
| * fs_mgr: error check umount calls / add retry logicNick Kralevich2015-02-052-3/+14
| * Make encryption configurablePaul Lawrence2015-01-283-3/+7
| * Provide a way to select force encryption from vendor partitionPaul Lawrence2015-01-281-1/+12
* | 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
|\ \ \ | | |/ | |/|
| * | fs_mgr: Support filesystem labels in fstabChristoffer Dall2015-01-231-0/+91
* | | am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""Elliott Hughes2015-01-231-91/+0
|\ \ \ | |/ /
| * | Merge "Revert "fs_mgr: Support filesystem labels in fstab""Elliott Hughes2015-01-231-91/+0
| |\ \
| | * | 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
|\ \ \ \ | |/ / /
| * | | Merge "fs_mgr: Support filesystem labels in fstab"JP Abgrall2015-01-221-0/+91
| |\ \ \ | | |/ /
| | * | fs_mgr: Support filesystem labels in fstabChristoffer Dall2015-01-171-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
|\ \ \ \ | | |/ / | |/| |
| * | | Fix Nick's nitsPaul Lawrence2014-12-091-4/+4
* | | | am 294e610f: Merge "Fix verity on system partitions larger than 2G"Elliott Hughes2014-12-101-3/+4
|\ \ \ \ | |/ / /
| * | | Fix verity on system partitions larger than 2GSami Tolvanen2014-12-091-22/+26
* | | | resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aospElliott Hughes2014-12-091-11/+8
|\ \ \ \ | |/ / /
| * | | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-12-096-29/+87
| | |/ | |/|
| * | am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
| |\ \
* | \ \ 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
* | | | am 4cafe2ff: Fix verity on system partitions larger than 2GSami Tolvanen2014-10-311-22/+26
|\ \ \ \ | |/ / /
| * | | Fix verity on system partitions larger than 2GSami Tolvanen2014-10-291-22/+26
* | | | am 97e48731: Fix Nick\'s nitsPaul Lawrence2014-10-101-4/+4
|\ \ \ \ | |/ / /
| * | | Fix Nick's nitsPaul Lawrence2014-10-091-4/+4
* | | | resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-106-28/+87
|\ \ \ \ | |/ / /
| * | | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-10-096-28/+87
* | | | resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-096-67/+20
|\ \ \ \ | |/ / /
| * | | Revert "Enable verity on userdebug, and add disable-verity to adb"Nick Kralevich2014-10-086-67/+20
* | | | resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-096-21/+67
|\ \ \ \ | |/ / /
| * | | Enable verity on userdebug, and add disable-verity to adbPaul Lawrence2014-10-086-20/+67
* | | | am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | fs_mgr: fix build breakageMark Salyzyn2014-10-081-0/+1
* | | am cf234dc7: Preserve errno from fsmgr_do_mountPaul Lawrence2014-09-122-2/+9
|\ \ \ | | |/ | |/|
| * | Preserve errno from fsmgr_do_mountPaul Lawrence2014-09-112-2/+9
* | | am 04929638: am da3510b2: Merge "Avoid partial initialization warning."Chih-Hung Hsieh2014-09-101-1/+3
|\ \ \ | |/ / |/| / | |/
| * Avoid partial initialization warning.Chih-Hung Hsieh2014-09-081-1/+3
* | [HACK]fs_mgr+init: Format via recovery if encryptable /data is wipedJP Abgrall2014-07-022-4/+7
* | fs_mrg: clean up multi-type mount_allJP Abgrall2014-07-022-60/+95
* | Merge "fs_mgr: fix crash on "noemulatedsd" in fstab"Todd Poynor2014-07-011-6/+2
|\ \
| * | fs_mgr: fix crash on "noemulatedsd" in fstabTodd Poynor2014-07-011-6/+2
* | | fs_msg: fix bad tmpfs detection (fix /persist mount errors)JP Abgrall2014-06-301-1/+1
|/ /