summaryrefslogtreecommitdiffstats
path: root/fs_mgr/include
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of d0b6de41 to masterEd Tam2015-04-131-1/+4
|\ | | | | | | Change-Id: I1d1f6b1cdbd7ee441682c4258a11fb3198ca7d94
| * resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aospEd Tam2015-04-131-1/+4
| |\ | | | | | | | | | Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280
| | * fs_mgr: introduce fs_mgr_format to format wiped partitionsChris Fries2015-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the ↵Sami Tolvanen2015-04-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-071-1/+1
| |\ \
| | * | Set verity mode as the verified property valueSami Tolvanen2015-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-03-311-5/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix build break caused by original change This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5. Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
* | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-04-011-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | verity metadata" * commit 'c28e2598af394834dbf6532f1cf252705fabd76b': Use structured format for verity metadata
| * | Use structured format for verity metadataSami Tolvanen2015-03-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-10/+6
| | | | | | | | | | | | | | | | | | This reverts commit 6095afc115fe3a4b7d151b4fcc164e00f9df9659. Change-Id: Icedfe0036223d7f42eaaefc4a35ad0f2efb14e4e
* | | Adding e4crypt supportPaul Lawrence2015-03-231-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-5/+9
|\ \ \ | |/ / | | | | | | | | | * commit '54bac178ce0ee9d243bfbfc9c18dafbb14cd3f92': Add init command to set verified properties
| * | Add init command to set verified propertiesSami Tolvanen2015-03-191-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | fs_mgr: recognize a notrim mountpoint flagJP Abgrall2015-03-051-0/+1
|/ / | | | | | | | | | | | | | | Some partitions don't need trimming. Needs a vold:fstrim change Bug: 19624276 Change-Id: I8df715bd18688d7921afa2f3743f7d2a68760699
* | am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"Sami Tolvanen2015-03-041-0/+10
|\ \ | |/ |/| | | | | * commit 'a88fb24ab43eec9710a0d4d15aedb6d4bc51a2ec': Add fs_mgr support for dm-verity modes
| * Add fs_mgr support for dm-verity modesSami Tolvanen2015-03-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Make encryption configurablePaul Lawrence2015-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | 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-12-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33. Fixed build error, and also fixed memory leak spotted from warning. (cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.) Bug: 17691572 Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
* | Revert "Make encryption configurable"Paul Lawrence2015-02-061-1/+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/+1
| | | | | | | | | | | | | | | | | | | | | | 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/+8
| | | | | | | | | | | | | | | | | | 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-8/+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/+8
|/ | | | | | Bug: 17691572 Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
* Preserve errno from fsmgr_do_mountPaul Lawrence2014-09-111-0/+3
| | | | | Bug: 17358530 Change-Id: I4cd7403c0b7c4f878d6afa5199f998e6f614adb9
* [HACK]fs_mgr+init: Format via recovery if encryptable /data is wipedJP Abgrall2014-07-021-0/+1
| | | | | | | | | | | | | If the encryptable partition is wiped (4KB worth of 0 or 0xff), then reboot into recovery to format /data+/cache This is while waiting for the Mac OS support to format f2fs. The flashstation running on Mac OS will currently just erase userdata and not format it with f2fs. Bug: 15720406 Bug: 15747366 Change-Id: Ib7cca3e1701483a09573457a835750f34da71ee0
* fs_mrg: clean up multi-type mount_allJP Abgrall2014-07-021-0/+4
| | | | | | | | | | | Move the code that attempts to mount alternative fstab entries into its own function. Clarify return codes. Suggest wipe via recovery in error messages. Bug: 15747366 Change-Id: I3634477cd4d1d73f974f3e906c53285f0d9e0eac Signed-off-by: JP Abgrall <jpa@google.com>
* fsmgr: support multiple fs-types/mountpointJP Abgrall2014-06-181-0/+5
| | | | | | | | | | | | | | | | | | | | | 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-5/+0
| | | | | | | | | 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-0/+5
| | | | | | | | | | | | | | | | | | | | 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>
* 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>
* New fstab flags to support more expressive SD card permissionsKen Sumrall2013-09-201-0/+1
| | | | | | Bug: 10330128 Change-Id: I41fb178b839487b604762fbc1ccba097d25c7aa0
* Add basic verity support to fs_mgr.Geremy Condra2013-08-061-0/+4
| | | | | | | | | | | This change adds a "verify" fs_mgr flag specifying that the device in question should be verified. Devices marked with this flag are expected to have a footer immediately after their data containing all the information needed to set up a verity instance. Change-Id: I10101f2c3240228ee0932e3767fe35e673d2e720
* Add support for swap entries in fstabKen Sumrall2013-07-091-0/+3
| | | | | | | Swap entries can optionally specify a swapprio= or zramsize= flag in the fs_mgr flags field. Change-Id: I30530501efd4112af4e158898a9f65f6443c4fdb
* fs_mgr: support a unified fstab format.Ken Sumrall2013-02-191-4/+41
| | | | | | | Update fs_mgr to support more flags needed to unify the 3 fstabs currently in android into one. Change-Id: Ie46cea61a5b19882c55098bdd70f39e78fb603be
* A filesystem manager library to mount filesystems for init.Ken Sumrall2012-04-301-0/+27
Instead of specifying in init what to mount, and having various hacks in init itself to deal with encryption, use a filesystem manager library to do the work, that can also be invoked by vold when mounting an encrypted volume. Keep all the magic filesystem info an a device specific fstab file. Change-Id: Ib988f1e4fb0638ba1d5fd98407fa6d8cf862aaca