summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Expand)AuthorAgeFilesLines
* am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"Yusuke Sato2015-08-191-4/+5
|\
| * Add |opts| argument to android_fork_execvp_extYusuke Sato2015-08-191-4/+5
* | am 39087653: am 13d62278: Merge "Skip mounting /, just mark block device as r...Daniel Rosenberg2015-08-041-0/+8
|\|
| * Skip mounting /, just mark block device as ro if needed.Daniel Rosenberg2015-08-041-0/+8
* | am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot"Yusuke Sato2015-07-211-2/+2
|\|
| * Merge "Use fsck.f2fs -a instead of -f for faster boot"Yusuke Sato2015-07-211-2/+2
| |\
| | * Use fsck.f2fs -a instead of -f for faster bootYusuke Sato2015-07-151-2/+2
* | | am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boo...Sami Tolvanen2015-07-151-5/+11
|\| |
| * | Update partition.*.verified even with ro.boot.veritymode setSami Tolvanen2015-07-151-5/+11
| |/
* | am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config param...Thierry Strudel2015-07-101-1/+1
|\ \
| * | fs_config: replace getenv('OUT') by new fs_config parameterThierry Strudel2015-07-091-1/+1
| * | fs_mgr: Use ro.boot.veritymodeSami Tolvanen2015-07-081-1/+24
| * | DO NOT MERGE Securely encrypt the master keyPaul Lawrence2015-05-291-11/+1
* | | am 450a24a5: am c604ccfa: Merge "Only pass nomblk_io_submit option when mount...Elliott Hughes2015-06-111-1/+5
|\ \ \ | | |/ | |/|
| * | Merge "Only pass nomblk_io_submit option when mounting ext4"Elliott Hughes2015-06-111-1/+5
| |\ \
| | * | Only pass nomblk_io_submit option when mounting ext4Oreste Salerno2015-06-091-1/+5
* | | | am ecad7587: am 4e359e1d: Merge "fs_mgr: Use ro.boot.veritymode"Sami Tolvanen2015-06-101-1/+24
|\| | |
| * | | fs_mgr: Use ro.boot.veritymodeSami Tolvanen2015-06-101-1/+24
| |/ /
| * | Don't use TEMP_FAILURE_RETRY on close in system/core.Elliott Hughes2015-05-152-10/+10
* | | am 9fc83437: Don\'t use TEMP_FAILURE_RETRY on close in system/core.Elliott Hughes2015-05-272-10/+10
|\ \ \ | | |/ | |/|
| * | Don't use TEMP_FAILURE_RETRY on close in system/core.Elliott Hughes2015-05-272-10/+10
* | | am b33118ac: am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for ...Iliyan Malchev2015-05-131-1/+21
|\| |
| * | am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to b...Iliyan Malchev2015-05-131-1/+21
| |\ \
| | * \ am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified a...Iliyan Malchev2015-05-121-1/+21
| | |\ \
| | | * \ Merge "fs_mgr: allow for zramsize to be specified as percentage of total memo...Iliyan Malchev2015-05-121-1/+21
| | | |\ \
| | | | * | fs_mgr: allow for zramsize to be specified as percentage of total memoryIliyan Malchev2015-05-011-1/+21
* | | | | | am 8b41a4a3: am 9680eaa1: Merge "fs_mgr: remove some dead code"Elliott Hughes2015-05-071-4/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | fs_mgr: remove some dead codeOleksiy Avramchenko2015-05-071-4/+0
* | | | | | Merge commit '2fe6a631' into manualmergePaul Lawrence2015-04-291-11/+1
|\| | | | |
| * | | | | Securely encrypt the master keyPaul Lawrence2015-04-281-11/+1
* | | | | | resolved conflicts for merge of 6a5244bc to mnc-dev-plus-aospPaul Lawrence2015-04-281-1/+11
|\| | | | |
| * | | | | Merge "Revert "Securely encrypt the master key""Paul Lawrence2015-04-281-1/+11
| |\ \ \ \ \
| | * | | | | Revert "Securely encrypt the master key"Paul Lawrence2015-04-281-1/+11
* | | | | | | resolved conflicts for merge of 72fad66f to mnc-dev-plus-aospPaul Lawrence2015-04-271-11/+1
|\| | | | | | | |_|/ / / / |/| | | | |
| * | | | | Merge "Securely encrypt the master key"Paul Lawrence2015-04-271-11/+1
| |\| | | |
| | * | | | Securely encrypt the master keyPaul Lawrence2015-04-231-11/+1
* | | | | | am 92f075aa: am 48ba7587: am 34dd04db: Merge "Improve bad error reporting see...Elliott Hughes2015-04-241-1/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SE...Elliott Hughes2015-04-241-1/+4
| |\| | | |
| | * | | | Improve bad error reporting seen in shamu SELinux boot failures.Elliott Hughes2015-04-241-1/+4
| | |/ / /
* | | | | resolved conflicts for merge of d0b6de41 to masterEd Tam2015-04-136-5/+171
|\| | | |
| * | | | resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aospEd Tam2015-04-136-5/+171
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | fs_mgr: introduce fs_mgr_format to format wiped partitionsChris Fries2015-04-106-3/+171
* | | | am d087e6f3: am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: ...Mohamad Ayyash2015-04-092-27/+54
|\| | |
| * | | Revert "Revert "fs_mgr_verity: Add support for squashfs""Mohamad Ayyash2015-04-082-27/+54
* | | | am 0009bacf: am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add supp...Mohamad Ayyash2015-04-082-39/+26
|\| | |
| * | | 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
* | | | | am d411d14a: am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for ...Mohamad Ayyash2015-04-082-26/+39
|\| | | |
| * | | | 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