summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Collapse)AuthorAgeFilesLines
* am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic"Nick Kralevich2015-02-062-3/+14
|\ | | | | | | | | * commit '17b5b3520094de679c9e43a872c02d15758c83b8': fs_mgr: error check umount calls / add retry logic
| * fs_mgr: error check umount calls / add retry logicNick Kralevich2015-02-052-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't silently ignore umount errors. At a minimum, log them. Add strerror(errno) to another umount call, to make sure we get some actionable data. check_fs: try 5 times umounting the filesystem. It appears that the umount is failing, perhaps because some service is opening the file on the device or other error. Try unmounting it multiple times in case it's a transient problem and we can recover. Bug: 19199624 Bug: 19156134 Change-Id: I7213eb52d55116fb2419a36494d26d5e159981a7
| * Make encryption configurablePaul Lawrence2015-01-283-3/+7
| | | | | | | | | | | | | | | | | | | | | | 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
| * Provide a way to select force encryption from vendor partitionPaul Lawrence2015-01-281-1/+12
| | | | | | | | | | | | | | | | | | | | This allows a vendor to force encryption on devices via a vendor partition flag: ro.vold.forceencryption 1 Bug: 18764230 Change-Id: Id0049ce64e34e4f6f96e593aadd70c277ac131c8
* | am bda62724: Make encryption configurablePaul Lawrence2015-01-263-3/+7
|\ \ | | | | | | | | | | | | * commit 'bda6272446454886339841a62daaa1b66c07ad60': Make encryption configurable
| * | Make encryption configurablePaul Lawrence2015-01-213-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"Elliott Hughes2015-01-231-0/+91
|\ \ \ | | |/ | |/| | | | | | | * commit '4e0bdd1034ffcf55f4ebcbd547cf4aad59c05f03': fs_mgr: Support filesystem labels in fstab
| * | fs_mgr: Support filesystem labels in fstabChristoffer Dall2015-01-231-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When mounting fstab entries it is practical to be able to specify for example LABEL=data instead of a specific block device. This is particularly important for the new Android Emulator code base, which uses virtio block devices for the various partitions (system,data,cache), because there is no defined ordering between the way the filesystems are specified to the emulator and how they are enumerated by the android kernel as /dev/vdX. Change-Id: I7aef95f12e8f7b02ac2e33804ba7897fdcb9ad7f Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
* | | am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""Elliott Hughes2015-01-231-91/+0
|\ \ \ | |/ / | | | | | | | | | * commit '4083ed7dff6e1dd8e20bec04f9451061951394f5': Revert "fs_mgr: Support filesystem labels in fstab"
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 69407ccb02a6b1b63f96657cd40a07c48e648cea. Change-Id: I537a3b4257b7bc2a69f1f4d62b4e18e91f2dc713
* | | | am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"JP Abgrall2015-01-231-0/+91
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f9e2339553f70aebdd170e96ab9332b28c3851b4': fs_mgr: Support filesystem labels in fstab
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When mounting fstab entries it is practical to be able to specify for example LABEL=data instead of a specific block device. This is particularly important for the new Android Emulator code base, which uses virtio block devices for the various partitions (system,data,cache), because there is no defined ordering between the way the filesystems are specified to the emulator and how they are enumerated by the android kernel as /dev/vdX. Change-Id: I12c3db0ba6a515dc8e917e0349afd257888d3aef Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
* | | | am f2bd3fdd: Merge "Provide a way to select force encryption from vendor ↵Leo Wang2015-01-091-1/+12
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | partition" into lmp-mr1-dev * commit 'f2bd3fdd190fc1234913febfe254f8bcc4e675da': Provide a way to select force encryption from vendor partition
| * | | Provide a way to select force encryption from vendor partitionPaul Lawrence2015-01-071-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows a vendor to force encryption on devices via a vendor partition flag: ro.vold.forceencryption 1 Bug: 18764230 Change-Id: Id0049ce64e34e4f6f96e593aadd70c277ac131c8
* | | | am a97c1075: Merge "Fix Nick\'s nits"Elliott Hughes2014-12-101-4/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a97c10755442e3800c0b1011d986d554ce2096db': Fix Nick's nits
| * | | Fix Nick's nitsPaul Lawrence2014-12-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of 97e487311b1cb780dfd3b0994917c72047d6188f.) Change-Id: Ide7925e7ad328f0343d444d63ff72f1a26206d4c
* | | | am 294e610f: Merge "Fix verity on system partitions larger than 2G"Elliott Hughes2014-12-101-3/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '294e610f886eeb839d16172bb5b98559a6a7434d': Fix verity on system partitions larger than 2G
| * | | Fix verity on system partitions larger than 2GSami Tolvanen2014-12-091-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the system partition is larger than 2G, the device fails to read verity metadata, because fseek accepts only a 32-bit signed offset. Switch from fseek to lseek64 to allow seeking using a 64-bit offset, which solves the problem. At the same time, move away from stdio in the function. (cherry-pick of 4cafe2ff89b49329e0e880900195d8e061bd3750.) Bug: 17705619 Change-Id: I226320498dcb750ec6cde84411c7fe0774c9cab7
* | | | resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aospElliott Hughes2014-12-091-11/+8
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I6efd0d4a0ece0b065d02796916355ad5ae8b4eea
| * | | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-12-096-29/+87
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33. Fixed build error, and also fixed memory leak spotted from warning. (cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.) Bug: 17691572 Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
| * | am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'af191cd157f076ee5d99890711e2881a60d7770a': fs_mgr: fix build breakage
* | \ \ am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-141-1/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '72f0d92c722447e0c87cfe765516a7352db3d51a': DO NOT MERGE: Do not mount devices with invalid verity metadata
| * | | DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The return value of read_verity_metadata is propagated to caller even if the verity metadata is invalid, provided that it can be read from the device. This results in devices with invalid verity metadata signatures to be mounted normally, which is not desirable. This change fixes the bug by changing the return value in case of verification failure to FS_MGR_SETUP_VERITY_FAIL. Bug: 15984840 Bug: 18120110 Change-Id: Ic29f37a23cb417c2538d60fb05de9dd310d50f4a (cherry picked from commit c95e9da39660f278ace4b14d688dc6818d1a38bf)
* | | | am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-141-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9573a13bbc015c555adff1e4e0fbef2a18963111': DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1
| * | | DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verity metadata signatures will be switched to SHA-256. Switch fs_mgr signature verification to use the correct algorithm. Needs matching changes from https://googleplex-android-review.git.corp.google.com/#/c/579905/ https://googleplex-android-review.git.corp.google.com/#/c/583213/ https://googleplex-android-review.git.corp.google.com/#/c/583214/ https://googleplex-android-review.git.corp.google.com/#/c/583233/ Bug: 15984840 Bug: 18120110 Bug: 17917515 Change-Id: I8f90519bffa105a0eb7abeaad3aea1ffceb851e2 (cherry picked from commit a3465e250cfc3c00931735711e11ad61cf84d8b2)
* | | | fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-121-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: eb6036a * commit 'eb6036ac6be82dcc6e110de22574972631c8f83e': fs_mgr: let fsck.f2fs actually attempt a fix
| * | | fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newer fsck.f2fs (1.4.0++) has better fix support, so invoke it. Requires http://ag/583949 f2fs-tools update. Bug: 17640053 Bug: 18292088 Change-Id: I42370d92b232e0bdbf28cccf7035a15dbffeb268 Signed-off-by: JP Abgrall <jpa@google.com>
* | | | am 4cafe2ff: Fix verity on system partitions larger than 2GSami Tolvanen2014-10-311-22/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4cafe2ff89b49329e0e880900195d8e061bd3750': Fix verity on system partitions larger than 2G
| * | | Fix verity on system partitions larger than 2GSami Tolvanen2014-10-291-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the system partition is larger than 2G, the device fails to read verity metadata, because fseek accepts only a 32-bit signed offset. Switch from fseek to lseek64 to allow seeking using a 64-bit offset, which solves the problem. At the same time, move away from stdio in the function. Bug: 17705619 Change-Id: I226320498dcb750ec6cde84411c7fe0774c9cab7
* | | | am 97e48731: Fix Nick\'s nitsPaul Lawrence2014-10-101-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '97e487311b1cb780dfd3b0994917c72047d6188f': Fix Nick's nits
| * | | Fix Nick's nitsPaul Lawrence2014-10-091-4/+4
| | | | | | | | | | | | | | | | Change-Id: Ide7925e7ad328f0343d444d63ff72f1a26206d4c
* | | | resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-106-28/+87
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I6b62347c3acfda7c2c954e719547021009d20c01
| * | | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-10-096-28/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33. Fixed build error, and also fixed memory leak spotted from warning. Bug: 17691572 Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
* | | | resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-096-67/+20
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I9ff777a6309aab2b5b18323dd4ee7617cb1c3180
| * | | Revert "Enable verity on userdebug, and add disable-verity to adb"Nick Kralevich2014-10-086-67/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-096-21/+67
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
| * | | Enable verity on userdebug, and add disable-verity to adbPaul Lawrence2014-10-086-20/+67
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 17691572 Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
* | | | am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| * commit 'af191cd157f076ee5d99890711e2881a60d7770a': fs_mgr: fix build breakage
| * | fs_mgr: fix build breakageMark Salyzyn2014-10-081-0/+1
| | | | | | | | | | | | | | | | | | Some compilers are not as smart as other compilers Change-Id: I9d93c73bdbd2dca37373d8a42a2ed510d0559274
* | | am cf234dc7: Preserve errno from fsmgr_do_mountPaul Lawrence2014-09-122-2/+9
|\ \ \ | | |/ | |/| | | | | | | * commit 'cf234dc7e081ac4063c3c5ddcdd4da40c82d51cb': Preserve errno from fsmgr_do_mount
| * | Preserve errno from fsmgr_do_mountPaul Lawrence2014-09-112-2/+9
| | | | | | | | | | | | | | | Bug: 17358530 Change-Id: I4cd7403c0b7c4f878d6afa5199f998e6f614adb9
* | | am 04929638: am da3510b2: Merge "Avoid partial initialization warning."Chih-Hung Hsieh2014-09-101-1/+3
|\ \ \ | |/ / |/| / | |/ | | * commit '049296382d3604868378c957e999ae63cf3a1f5f': Avoid partial initialization warning.
| * Avoid partial initialization warning.Chih-Hung Hsieh2014-09-081-1/+3
| | | | | | | | | | | | | | | | Clang compiler is picky about partial initialization and here we only need to initialize the 'len' field. BUG: 17410010 Change-Id: I718582cef96d5f4076b5ff1c7b8162327e7809b6
* | [HACK]fs_mgr+init: Format via recovery if encryptable /data is wipedJP Abgrall2014-07-022-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-60/+95
| | | | | | | | | | | | | | | | | | | | | | 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>
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MF_FORCECRYPT claimed same flag value as existing MF_NOEMULATEDSD. MF_FORCECRYPT also crashes if no "=" in the option. Modify MF_NOEMULATEDSD flag value to unique, and reformat comment to keep the definition near the other defines. Change-Id: Iec86f40ff43eea14b791d3d19c0ae11fd4b5f784
* | | fs_msg: fix bad tmpfs detection (fix /persist mount errors)JP Abgrall2014-06-301-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Without this, the wrong mount point is flagged as being mounted. Which leads to: <6>[ 3.278040] fs_mgr: __mount(source=/dev/block/platform/msm_sdcc.1/by-name/userdata,target=/data,type=ext4)=-1 <7>[ 3.278834] SELinux: initialized (dev tmpfs, type tmpfs), uses transition SIDs <6>[ 3.278925] fs_mgr: fs_mgr_mount_all(): skipping fstab dup mountpoint=/persist rec[3].fs_type=ext4 already mounted. Bug: 15925030 Bug: 15976144 Change-Id: I0bc617f11dfc97c32bb2d0e52b94ec19282568eb
generated by cgit v1.1 at 2025-01-11 23:41:44 +0000