summaryrefslogtreecommitdiffstats
path: root/fs_mgr/fs_mgr_fstab.c
Commit message (Collapse)AuthorAgeFilesLines
* fs_mgr: zram: allow specifying stream countSultan Qasim Khan2015-10-161-0/+6
| | | | | | | | | | | | This parameter allows specifying the number of parallel streams to be used in compression and decompression. This option was added in Linux 3.15, so it is not very common among devices currently on the market, but it has been backported to some kernels. This option must be set before zRAM is activated, as the kernel does not allow switching from single stream to multistream compression once zRAM is active. Change-Id: I3f5ad96a65b3b4a6915d2700c398a236ea8931b0
* 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>
* | | | resolved conflicts for merge of d0b6de41 to masterEd Tam2015-04-131-0/+6
|\| | | | | | | | | | | | | | | Change-Id: I1d1f6b1cdbd7ee441682c4258a11fb3198ca7d94
| * | | resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aospEd Tam2015-04-131-0/+6
| |\| | | | | | | | | | | | | | Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280
| | * | fs_mgr: introduce fs_mgr_format to format wiped partitionsChris Fries2015-04-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-03-311-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build break caused by original change This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5. Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
* | | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-04-011-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build break caused by original change This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5. (cherry picked from commit bbb4c85bdcc9a1bce315ed9d61a228bb1b992a1c) Change-Id: If0ead0f2656b69f33f72c64b03a05784455a4143
* | | | am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for ↵Sami Tolvanen2015-03-261-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | verity metadata" * commit 'c28e2598af394834dbf6532f1cf252705fabd76b': Use structured format for verity metadata
| * | | Use structured format for verity metadataSami Tolvanen2015-03-241-0/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | 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-261-12/+6
| | | | | | | | | | | | | | | | | | This reverts commit 6095afc115fe3a4b7d151b4fcc164e00f9df9659. Change-Id: Icedfe0036223d7f42eaaefc4a35ad0f2efb14e4e
* | | Adding e4crypt supportPaul Lawrence2015-03-231-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | fs_mgr: recognize a notrim mountpoint flagJP Abgrall2015-03-051-0/+6
|/ / | | | | | | | | | | | | | | Some partitions don't need trimming. Needs a vold:fstrim change Bug: 19624276 Change-Id: I8df715bd18688d7921afa2f3743f7d2a68760699
* | Revert "Make encryption configurable"Paul Lawrence2015-02-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bda6272446454886339841a62daaa1b66c07ad60. The original fix seems to have led to boot failures in QA. Rather than risk shipping, revert the change. Bug 18764230 reopened. Requires change https://googleplex-android-review.git.corp.google.com/#/c/629764/ Bug: 19278390 Bug: 19199624 Change-Id: I8b6ab585666f2b0f585ffb2a5f61ac2e3462e06e
* | Make encryption configurablePaul Lawrence2015-01-211-0/+5
|/ | | | | | | | | | | Delay mounting encryptable but unencrypted volumes until we can check the ro.vold.forceencrypt flag, then optionally encrypt. Requires matching vold change from https://googleplex-android-review.git.corp.google.com/#/c/615309/ Bug: 18764230 Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
* Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-10-091-0/+5
| | | | | | | | | This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33. Fixed build error, and also fixed memory leak spotted from warning. Bug: 17691572 Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
* Revert "Enable verity on userdebug, and add disable-verity to adb"Nick Kralevich2014-10-081-5/+0
| | | | | | | | | | | | | | | | | | | Build is broken. system/core/fs_mgr/fs_mgr_verity.c: In function 'fs_mgr_setup_verity': system/core/fs_mgr/fs_mgr_verity.c:103:20: error: 'verity_table_signature' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (!RSA_verify(key, ^ system/core/fs_mgr/fs_mgr_verity.c:374:11: note: 'verity_table_signature' was declared here char *verity_table_signature; ^ cc1: all warnings being treated as errors make: *** [out/target/product/minnow/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr_verity.o] Error 1 make: *** Waiting for unfinished jobs.... This reverts commit d4cea0bc16d1ad96cc6d6177232d7b339785460c. Change-Id: I6862cc79ef9d944a2472b6fb2e46dae514cea8ce
* Enable verity on userdebug, and add disable-verity to adbPaul Lawrence2014-10-081-0/+5
| | | | | | Bug: 17691572 Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
* fsmgr: support multiple fs-types/mountpointJP Abgrall2014-06-181-4/+26
| | | | | | | | | | | | | | | | | | | | | Previous attempt was broken. It would incorrectly be affected by mount failures. This changes allows an fstab to contain multiple lines for a given mount point. The lines sharing a mount MUST be after each other. The 1st matching line is the primary when it comes to mounting and look ups for wiping. Mounting based on a mount_point will attempt each dup in turn until one succeeds. The reported error will be that of the last failed attempt. This is to allow quick experimentation between different FSes. Bug: 15702546 Change-Id: I378d68ad13eb0098ec1ccb8dcf108b82acbe9ebb Signed-off-by: JP Abgrall <jpa@google.com>
* fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)JP Abgrall2014-06-181-26/+4
| | | | | | | | | This is apparently breaking N5, so reverting for now. This reverts commit a794f86522f9125f2547c94ebc7c74d1e7ace013. Bug: 15709256 Change-Id: I37a5160eead17e153e2c83fa94632ffa5d8553c2
* fsmgr: allow for a multiple fs-types for a mount point.JP Abgrall2014-06-171-4/+26
| | | | | | | | | | | | | | | | | | | | This changes allows an fstab to contain multiple lines for a given mount point. The lines sharing a mount MUST be after each other. The 1st matching line is the primary when it comes to mounting and look ups for wiping. Mounting based on a mount_point will attempt each dup in turn until one succeeds. This is to allow quick experimentations between different FSes. It does not deal with checkfs yet, because the underlying invocation of fs-type appropriate fsck does not handle the error code. Only the primary FS (1st in the dups) is checked. Change-Id: I8329737454b53e2681436fe85cd00a9bc522676b Signed-off-by: JP Abgrall <jpa@google.com>
* am af0df46d: am e6246ca6: am 01ef52e1: Merge "fs_mgr: turn on -Werror"Mark Salyzyn2014-05-081-2/+0
|\ | | | | | | | | * commit 'af0df46d74368bb98edaadb3c09ddbc7252d3110': fs_mgr: turn on -Werror
| * fs_mgr: turn on -WerrorMark Salyzyn2014-05-071-2/+0
| | | | | | | | | | | | - deal with some -Wunused-variable issues Change-Id: Ie0140d4777ddf862e4bbed76142a1dbb8320c1b0
* | am 43cb7ae6: am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."Sasha Levitskiy2014-04-121-1/+1
|\| | | | | | | | | * commit '43cb7ae6c31ced8cd518eab59dfea31ab1ade812': Cleanup: warning fixit.
| * Cleanup: warning fixit.Sasha Levitskiy2014-04-111-1/+1
| | | | | | | | | | | | | | bootable/recovery has a dependent commit: I9adb470b04e4301989d128c9c3097b21b4dea431 Change-Id: Icf23e659265d71d5226d527c2b40cfbc132320ee Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | Add force_encrypt flag to fstab to force encryption on appropriate devicesPaul Lawrence2014-04-041-1/+7
|/ | | | | | | | | forceencrypt= will encrypt the drive at boot if it is not encrypted. This change will not have an impact until we set this flag in appropirate fstabs. Bug: 11985952 Change-Id: I6c65eda7f109e4936aa160da50f871703aefb351
* fs_mgr: split fstab parsing into separate fileColin Cross2014-01-231-0/+403
Move fstab parsing into fs_mgr_fstab.c so that it compiles into a separate compilation unit. uncrypt links against it but doesn't need to pull in the rest of the dependencies on fs_mgr.c. Change-Id: I6bffe1cd42720151533e958028259d1931aaa4bf