summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Collapse)AuthorAgeFilesLines
* Build adbd for recoveryJiyong Park2018-05-241-0/+2
| | | | | | | | | | | | | adbd (and its dependencies) are marked as recovery_available:true so that recovery version of the binary is built separately from the one for system partition. This allows us to stop copying the system version to the recovery partition and also opens up the way to enable shared libraries in the recovery partition. Then we can also build adbd as a dynamic executable. Bug: 79146551 Test: m -j adbd.recovery Change-Id: Ib95614c7435f9d0afc02a0c7d5ae1a94e439e32a
* Adds /dev/block/by-name/<partition> symlinksBowgo Tsai2018-05-192-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During uevent processing, some "by-name" symlinks will be created. /dev/block/<type>/<device>/by-name/<partition> <type> can be: platform, pci or vbd. <device> might be: soc.0/f9824900.sdhci, soc.0/f9824900.sdhci, etc. <partition> might be: system, vendor, system_a, system_b, etc. e.g., on a non-A/B device: /dev/block/platform/soc.0/f9824900.sdhci/by-name/system /dev/block/platform/soc.0/f9824900.sdhci/by-name/vendor On a A/B device: /dev/block/platform/soc/1da4000.ufshc/by-name/system_a /dev/block/platform/soc/1da4000.ufshc/by-name/system_b /dev/block/platform/soc/1da4000.ufshc/by-name/vendor_a /dev/block/platform/soc/1da4000.ufshc/by-name/vendor_b However, those symlinks are "device-specific". This change adds the "generic" symlinks in ueventd, in addition to the existing symlinks, when the possible "boot devices" are specified in device tree. e.g., &firmware_android { compatible = "android,firmware"; boot_devices ="soc/1da4000.ufshc,soc.0/f9824900.sdhci"; } The following symlinks will then be created on the aforementioned non-A/B and A/B devices, respectively. /dev/block/by-name/system /dev/block/by-name/vendor /dev/block/by-name/system_a /dev/block/by-name/system_b /dev/block/by-name/vendor_a /dev/block/by-name/vendor_b Note that both <type> and <device> are skipped in the newly create symlinks. It assumes there is no more than one devices with the same <partition>, which is the assumption of current first stage mount flow. Finally, when 'boot_devices' in DT is absent, it fallbacks to extract 'boot_devices' from fstab settings. e.g., using 'soc/1da4000.ufshc', 'soc.0/f9824900.sdhci' for a fstab with the following content: /dev/block/platform/soc/1da4000.ufshc/by-name/system /dev/block/platform/soc.0/f9824900.sdhci/by-name/vendor Bug: 78613232 Test: adb shell ls /dev/block/by-name Change-Id: Iec920b5a72409b6a2bdbeeb290f0a3acd2046b5d
* init/fs_mgr: prototype first-stage dm-linear supportDavid Anderson2018-05-1410-11/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an API to fs_mgr for reading dm-linear tables out of device trees and issuing device-mapper ioctls. The device tree code will be implemented separately. The dm-linear structures in fs_mgr are organized assuming we may want to pull them from sources other than DT (for example, text files, binary blobs, or something hardcoded for testing). File systems which are mounted from these logical partitions have specific fstab requirements. The block device must be a partition name, and if Verified Boot is used, that name must match the vbmeta partition name. Second, the entry must have the "logical" fs_mgr flag. Example fstab entry: vendor /vendor ext4 ro wait,logical Example fstab entry in device tree: vendor { compatible = "android,fstab"; dev = "vendor"; type = "ext4"; mnt_flags = "ro"; fs_mgr_flags = "wait,slotselect,avb,logical"; }; Bug: 78914864 Test: N/A Change-Id: I4d8878ea8858f26310119616cadc3ee0dd08566c
* fs_mgr: target-agnostic device-mapper helpersDavid Anderson2018-05-035-30/+30
| | | | | | | | | | Remove "verity" from device-mapper helper functions so it's clear they can be re-used for non-verity targets. Bug: 78914864 Test: AVB device still boots Change-Id: Id8474b2c6e23e828eff563263ebb409031cde17e
* fs_mgr: clean up dm ioctl flagsDavid Anderson2018-05-025-10/+11
| | | | | | | | | | | | DM_READONLY_FLAG should only be used when loading tables, and DM_STATUS_TABLE_FLAG should only be used when querying a table's status. This patch cleans up how we set flags to reflect when the kernel actually cares about them. Bug: 78914864 Test: AVB device still boots Change-Id: I809d8c2ef2105849ebdd095bbe7f08f15ae63465
* make_f2fs: specify sector size for target image size and missing optionsJaegeuk Kim2018-04-041-1/+12
| | | | | | | | | | | The total sectors that we want to format is used in different meanings from various users. This notifies its size based on 4096 bytes explicitly. Bug: 76407663 Change-Id: I4e00f2e2289c1381f0238d2a4acb606a0ab551a9 Merged-In: I4e00f2e2289c1381f0238d2a4acb606a0ab551a9 Reported-by: katao@xiaomi.com Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
* Support Speck encryption.Paul Crowley2018-03-301-1/+5
| | | | | | | Test: Modified Pixel to support and use Speck encryption, booted. Bug: 77227248 Change-Id: I6ec272db5e4f16e9dd4f759203c14ad2a8772cd1 Merged-In: I6ec272db5e4f16e9dd4f759203c14ad2a8772cd1
* fs_mgr: Ignore invalid DT device nodesTom Marshall2018-03-071-0/+6
| | | | | | | | | | | With treble, the vendor kernel and ramdisk are supposed to be used. But vendors always find new and interesting ways to break things: $ cat /proc/device-tree/firmware/android/fstab/system/dev; echo /by-name/system_a $ Change-Id: I826a96ebd625b52563d3cc970bf99d9b26dc093e
* fs_mgr: add sysfs_path=%s to indicate a location of sysfs entryJaegeuk Kim2018-02-263-1/+16
| | | | | | | | | | | | | | This patch adds sysfs_path=%s in fstab to get the sysfs entry path. One example is that vold is able to conduct UFS-specific operations given the below fstab entry. /dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard latemount,wait,check,fileencryption=ice,quota,formattable,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc Bug: 63264275 Bug: 68721792 Change-Id: I5097873893948f12296ac5eaa0c2a59a6e6dd9e1 Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
* Use vold's mount with metadata encryption service.Paul Crowley2018-02-011-0/+30
| | | | | | | | | Don't use the FDE flow to support metadata encryption; just use the vold service which directly mounts the volume. Bug: 63927601 Test: Boot Taimen to SUW with and without metadata encryption. Change-Id: Idf9c27a69872cd7a9e2fb76df09a91d8e5ef4896
* Merge "fs_mgr: don't log error messages when missing fstab"Christopher Morin2018-01-081-5/+8
|\
| * fs_mgr: don't log error messages when missing fstabChris Morin2018-01-051-5/+8
| | | | | | | | | | | | | | | | | | Some devices, such as android on chromebooks, don't need an fstab. Test: Ensure no error messages are seen from fs_mgr when fstab is missing. Change-Id: Ifadb2193743a61d03f1becefd6bc81a61eb45081
* | Merge changes from topic "resgidz"Jeff Sharkey2018-01-081-5/+7
|\ \ | |/ |/| | | | | | | | | * changes: Add reserved disk GID to critical component. Set reserved GID when setting reserved blocks. Allocate GID to use reserved disk space.
| * Set reserved GID when setting reserved blocks.Jeff Sharkey2018-01-071-5/+7
| | | | | | | | | | | | | | | | | | | | If we're setting up the number of reserved blocks, we also want to set our new AID_DISK_RESERVED as the GID that's allowed to use those blocks. Test: builds, boots Bug: 62024591 Change-Id: Iaabfa7d63ad9ff0b9732e2b9996937607d622fe2
* | fs_mgr: fix memory leakChris Morin2018-01-041-3/+4
|/ | | | | | | The fstab struct wasn't properly being freed. Test: Ensure a user of fs_mgr (vold) runs without errors. Change-Id: I4dcb8ae2ab3e831fbdb13372eb31a67a5d9fb735
* Merge "first stage mount: support mount points like /vendor/abc"Treehugger Robot2017-12-142-16/+37
|\
| * first stage mount: support mount points like /vendor/abcBowgo Tsai2017-12-142-16/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current syntax of the fstab in device tree (fstab_dt) assumes the node name is the mount point, which doesn't allow subdir: vendor { <== using "vendor/abc" leads to syntax error in device tree compatible = "android,vendor"; dev = "/dev/block/platform/soc.0/f9824900.sdhci/by-name/vendor"; type = "ext4"; mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; fsmgr_flags = "wait"; }; This CL adds a new field "mnt_point" in the fstab_dt configuration: vendor_abc { compatible = "android,vendor_abc"; dev = "/dev/block/platform/soc.0/f9824900.sdhci/by-name/abc"; type = "ext4"; mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; mnt_point = "/vendor/abc"; <== new field fsmgr_flags = "wait"; }; The new field is optional and will fallback to using node name as mount point if it is absent. Note that this CL also sorts fstab_dt by mount point, because /vendor needs to be mounted first, which contains a directory /vendor/abc, before /vendor/abc can be mounted. Bug: 69955336 Test: first stage mount /vendor/abc on a device Change-Id: Ie2e519f9801f211a7a221622f32c82bedd00353f
* | Merge changes from topic "sload_f2fs"Jaegeuk Kim2017-12-081-8/+36
|\ \ | | | | | | | | | | | | | | | * changes: fastboot/fs_mgr/init: add sload_f2fs fs_mgr: format f2fs with length=xx fstab
| * | fs_mgr: format f2fs with length=xx fstabJaegeuk Kim2017-12-061-8/+36
| |/ | | | | | | | | | | | | Merged-In: Icce29ad918f20b16c9908e7fa3ae19eb8c96760b Change-Id: Icce29ad918f20b16c9908e7fa3ae19eb8c96760b Signed-off-by: Jaegeuk Kim <jaegeuk@google.com> (cherry picked from commit a3674307342581b9746ed8efcd132580e69ed025)
* | Merge "Add OWNERS."Elliott Hughes2017-12-071-0/+2
|\ \ | |/ |/|
| * Add OWNERS.Elliott Hughes2017-12-071-0/+2
| | | | | | | | | | | | Bug: N/A Test: N/A Change-Id: Ie785058c0f5eb9b4086c98ccba6e63e3ed411b65
* | Merge "Remove dead code."Elliott Hughes2017-12-072-155/+0
|\ \
| * | Remove dead code.Elliott Hughes2017-12-062-155/+0
| |/ | | | | | | | | | | Bug: N/A Test: boots Change-Id: Id901d95aa05d26767aa5d956ac6e167db1cc3036
| * Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back"Treehugger Robot2017-11-131-3/+10
| |\
| | * DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot backSandeep Patil2017-11-101-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taimen bootloader passes androidboot.slot for now. This reverts commit 211a4a5d5a458b89e25f22bf364ae0b5a5da010c. Bug: 68710251 Test: taimen successfully mounts partition in first stage Change-Id: I046afc99120e7ec9ef4b8ea7a852eb70e7231ea9 Signed-off-by: Sandeep Patil <sspatil@google.com>
* | | Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' fromXin Li2017-11-141-5/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40 Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
| * | Merge "fs_mgr: removing is_device_secure()" am: af54c27e1b am: 6353d514e8Bowgo Tsai2017-10-154-22/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | am: ee042cac71 Change-Id: I3579738b8d9a3d4026294ba3392b56a55aedb9a9
| * \ \ Merge "Move some properties users to __system_property_read_callback()" am: ↵Tom Cherry2017-10-122-26/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a5a337ef2 am: 604f61dcbd am: 6597b95707 Change-Id: Ib6763ccc6a0b02949c6a0e004c18502cac7ea46f
| * \ \ \ Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS" am: 85b80dc18d am: ↵Bowgo Tsai2017-10-112-17/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4b15d7e2c am: c13381d680 Change-Id: I06eb6e086a1fbdff4de1c4bed28d136c5e81caab
| * \ \ \ \ Merge "fs_mgr_fstab: removing fs_mgr_get_entry_for_mount_point_after()" am: ↵Bowgo Tsai2017-09-302-31/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16e31801a5 am: b08be62fca am: af8315d4de Change-Id: I479153f77d9308f56412e9a991a6b669cf390d97
| * \ \ \ \ \ Merge "fs_mgr_fstab: do an exact match when searching a mount point" am: ↵Bowgo Tsai2017-09-261-7/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0dd1adab0 am: dff1e3418e am: d4ce377d8c Change-Id: I39df04346c5d45ebd8689c25bd2a3244b185fc90
| * \ \ \ \ \ \ Merge "Reland "Remove comments and code about ro.boot.slot"" am: dea5e081ac ↵Tom Cherry2017-09-261-10/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9bc2a967cf am: 687cb99e96 Change-Id: I1d3a43ae6c7faeb9830e64ff6ba2da18965b9c34
| * \ \ \ \ \ \ \ Merge "Revert "Remove comments and code about ro.boot.slot"" am: eb00b1f3aa ↵Tom Cherry2017-09-211-3/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0ff5f16f7b am: aea4f28852 Change-Id: Ia2959362f8a48e1d3638a76e9c72f04d276cd5bc
| * \ \ \ \ \ \ \ \ Merge "Remove comments and code about ro.boot.slot" am: 7dcf076700 am: ↵Tom Cherry2017-09-201-10/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf6168fd53 am: 26d09e3b7c Change-Id: I08a4e0ea745f9471e7aabdc579c423528e60103b
| * \ \ \ \ \ \ \ \ \ Merge "Allow the use of a custom Android DT directory" am: 6fa0884188 am: ↵Bo Hu2017-07-294-17/+48
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b2e0e03d4 am: 8bdf7ed10e am: 5e8de93697 Change-Id: I065dbef72e7bc4d6233c9f73786139a78e9098d8
| * \ \ \ \ \ \ \ \ \ \ Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: f7b315c985 am: ↵Lennart Wieboldt2017-07-251-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a8b97b271 am: e1332dd01b Change-Id: I193d86abf96e64b29efc7266f4fa3a26b5d2b3af
| * \ \ \ \ \ \ \ \ \ \ \ Merge "fs_mgr:Add filter condition to make sure that the super block is ↵Keun-young Park2017-07-211-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct." am: 9dd1a12b1e am: bc4c5032fc am: 29a5cc174c am: 2eba1eb7d2 Change-Id: Iab8f87b34561b36ab9bf73fd1bb8662084717808
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "fs_mgr_verity: allow verification error when the device is unlocked" ↵Bowgo Tsai2017-07-201-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a68f633675 am: 84937296c6 am: e5de94756b am: 2e19aa92ed Change-Id: If3779eceac8084723c101a6f7fa9091c4f09128e
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2 am: ↵Tom Cherry2017-07-143-211/+210
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a6226929e am: d165de95da am: e1442a5df0 Change-Id: I470057eb4ccc0536eed869114cb999daf36469dc
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "fs_mgr: trim the terminating '\0' when reading from device tree" am: ↵Bowgo Tsai2017-07-141-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b76158d56a am: 3205cd6cc4 am: 776c67b4d5 am: ec721bdda2 Change-Id: I229b411a591b04de4bb557b1bc5b604d9a2e63d0
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "fs_mgr: Adding logs when failing to wait for a device file" am: ↵Jinguang Dong2017-07-065-54/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ca2a30368 am: 694985721f am: 0ac18b28cd am: febf2ad9d7 Change-Id: I8070df926d9949583e84dca03e5dd8acc78c8968
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: ↵Bowgo Tsai2017-07-064-13/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd0c2d8962 am: 328b56585e am: 06c6bf67e9 am: 3f10ecabf8 Change-Id: Id5317f717bf6d7a1e1be695b773b9abcad41ee56
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938 am: ↵Mark Salyzyn2017-07-051-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eef732555d am: ab6f80c350 am: 0c7862b805 Change-Id: Ica3272ac4c2e76fe2df04eeaa6e07e18d768b0f1
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "fs_mgr: add libfstab for vendor"TreeHugger Robot2017-06-283-89/+134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | fs_mgr: add libfstab for vendorJiyong Park2017-06-273-89/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libfstab is a subset of libfs_mgr, intended for vendors to use. It exposes APIs for reading fstab. Note this 'visible to vendor' does not mean that the API should be stable forever. The API can be changed in later releases of Android, ,but the newer Android must not cause run-time error when there is an older version of this static library being used somewhere. Bug: 62990533 Test: BOARD_VNDK_VERSION=current m -j libfstab.vendor Change-Id: If8fc73e4ae4c2f8281c41a12f1c18079aab8baa2
| * | | | | | | | | | | | | | | | | | | | Merge changes Ibe1feb39,I05be83e4,If1422e4d am: a4f086ab20 am: 3a156e6c2b ↵Mark Salyzyn2017-06-271-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ca0c0bb96e am: 872206fd80 Change-Id: I9c08baaf94f2eaaf2ad9633e70b9cd0c1dd484ed
| * | | | | | | | | | | | | | | | | | | | Merge "AVB: allow no metadata in the generic system.img for project Treble" ↵Bowgo Tsai2017-06-244-65/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c70bf5836c am: caa5b4417f am: 2410d0c792 am: 61cdb66230 Change-Id: I23cdb0a5826f3378245375c5f5551aa46edd8536
| * | | | | | | | | | | | | | | | | | | | | fs_mgr: properly propagate exec child errorsBen Fennema2017-06-221-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Child status was being requested, but ignored, so if the exec failed with something like file not found or permissions denied the return value with be 0 (success). Passing in NULL instead of &status causes the failure to be properly returned from execvp instead of in status. Test: erase f2fs userdata on device without /system/bin/make_f2fs and verify device boots into recovery to format the partition instead of believing the format succeeded and going into infinite f2fs.fsck loop. Bug: 62901965 Signed-off-by: Ben Fennema <fennema@google.com> Change-Id: Ia5bbf09d5a666402cba8437abcc56775583ba6d2
| * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'eng_first_stage_mount' am: b7e2f272ee am: ↵Sandeep Patil2017-06-223-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5341cf56a am: 91b5f4b172 am: 2980f49447 Change-Id: I7ddb996a9efcc42a3dcde1dc5843304498e7b9a7
| * | | | | | | | | | | | | | | | | | | | | | fs_mgr: replace make_ext4 api with e2fsprogsJin Qian2017-06-203-63/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Execute mke2fs to create empty ext4 filesystem. Execute e2fsdroid to initialize selinux context. Test: zero-out first 4k of data partition and reboot, fs_mgr successfully formats /data. Bug: 35219933 Change-Id: If6f72f62c618c64be703b83f0114a4dd0a2b079f