summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-31Revert "GsiService::enableGsi() checks return code of FinishInstall()" am: ↵Yo Chiang
fdd02739c2 am: 2206c0ab4f am: 367d870dcc Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536725 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I871d1ba7654ee791e5e8f188ce12975de34d7efe
2020-12-31gsi_tool: check closePartition() after installation am: f9f5dbb897 am: ↵Yo Chiang
fce7f2636c am: 8a9ba1b188 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536724 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id7a1a0d75d053d02166c6ea2f27bbf091bd4edfc
2020-12-31Revert "GsiService::enableGsi() checks return code of FinishInstall()" am: ↵Yo Chiang
fdd02739c2 am: 2206c0ab4f Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536725 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iec366a31427c11975a2eac136beb13f0c4c5757b
2020-12-31gsi_tool: check closePartition() after installation am: f9f5dbb897 am: ↵Yo Chiang
fce7f2636c Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536724 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I93292c30935d6d943e4680a823f7f03e7bb4617d
2020-12-31Revert "GsiService::enableGsi() checks return code of FinishInstall()" am: ↵Yo Chiang
fdd02739c2 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536725 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I991394a1bbbceefe2578b9069c8269967f7ef7e0
2020-12-31gsi_tool: check closePartition() after installation am: f9f5dbb897Yo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536724 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a41122909060664185d1b1b155ab4e3c4ef2997
2020-12-29Revert "GsiService::enableGsi() checks return code of FinishInstall()"Yo Chiang
This reverts commit 99ab518ed6b7fae95ba29b132227f993e0a099d0. enableGsi() shouldn't check FinishInstall() explicitly, instead the caller of enableGsi() should call closePartition(), and enableGsi() should assume that the installation was successful and any error was handled by the caller already. closePartition() was added in aosp/1404709. This opens up the path for optional DSU partitions. For example, failing to install a overlayFS scratch partition shouldn't be fatal, and the DSU installation should be able to continue without a scratch. Bug: 165925766 Bug: 165471299 Test: TH Change-Id: Ic9b653426cf7fc3c92279e9ceb7c1eb662c15cef
2020-12-29gsi_tool: check closePartition() after installationYo Chiang
Call closePartition() to check error status after each partition installation, so that we don't enable and reboot a DSU while the installation fails. Bug: 165471299 Test: gsi_tool install Change-Id: Ie1e5a97ee486af17c0d435853257d17e436a4553
2020-11-24Mark ab/6881855 as merged am: 5e16e7a07b am: 52a7fd2773Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/gsid/+/13113141 Change-Id: I7165c64aaccdf503c65f7b0ff0949cd9f356a28f
2020-11-24Mark ab/6881855 as merged am: 5e16e7a07bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/gsid/+/13113141 Change-Id: I11599b844e8c2016a5d55d4e2b49851030257223
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I73b2c81978eb66b0c0af85c849a6ed08ac158bc4
2020-11-04Merge "Add "create-partition" debugging API to gsi_tool" am: 802d4c6a7b am: ↵Yo Chiang
0b094013ed am: 74198d437c am: 62f1f1894d Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469543 Change-Id: I3b64c0c6032c90d9806b6bd0820caaf235dfd4cf
2020-11-04Merge "Add constants kDsuScratch and kDsuUserdata" am: 053df534d7 am: ↵Yo Chiang
b465fe24cd am: 7a240ab7e7 am: 44c866a1bd Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469542 Change-Id: Idd25fa273de2f3562c43ca3a3459654d89fa5b80
2020-11-04Merge "Add "create-partition" debugging API to gsi_tool" am: 802d4c6a7b am: ↵Yo Chiang
0b094013ed am: 74198d437c Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469543 Change-Id: I97b3c31ee76eaf03e3cc70e7e47d8d1425054f8d
2020-11-04Merge "Add constants kDsuScratch and kDsuUserdata" am: 053df534d7 am: ↵Yo Chiang
b465fe24cd am: 7a240ab7e7 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469542 Change-Id: I32d6aa9889aa39d165ce2ffdb119e7757882752b
2020-11-04Merge "Add "create-partition" debugging API to gsi_tool" am: 802d4c6a7b am: ↵Yo Chiang
0b094013ed Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469543 Change-Id: I3dea75a3223a30b45866365cdc23e0062871b968
2020-11-04Merge "Add constants kDsuScratch and kDsuUserdata" am: 053df534d7 am: b465fe24cdYo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469542 Change-Id: Icbece4cf356634d825a7dc8ccb5ab24f6264f8f8
2020-11-04Merge "Add "create-partition" debugging API to gsi_tool" am: 802d4c6a7bYo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469543 Change-Id: I6e505d7ae4d9eb2db28902b1e7dd679c4e5fc5e4
2020-11-04Merge "Add constants kDsuScratch and kDsuUserdata" am: 053df534d7Yo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469542 Change-Id: Iae71dac171fb675dfdcddbde47f0cd9ef34a9c86
2020-11-04Merge "Add "create-partition" debugging API to gsi_tool"Yo Chiang
2020-11-04Merge "Add constants kDsuScratch and kDsuUserdata"Yo Chiang
2020-10-26Merge "Destroy DSU metadata encryption key when wiping an installation" am: ↵Yo Chiang
5dc456a684 am: 14a42ed03a am: b57eb6c4e5 am: 894e55e55f Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452417 Change-Id: Ifbc45d7bac4fd3ebcff22dc1290036d86b3ead09
2020-10-26Merge "Add GetDsuMetadataKeyDir()" am: adb1b891a8 am: 76621fa1e5 am: ↵Yo Chiang
894bccb0ba am: 5a973e9777 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452416 Change-Id: Ic258b764be1818036e685e27742579930958a001
2020-10-26Merge "Destroy DSU metadata encryption key when wiping an installation" am: ↵Yo Chiang
5dc456a684 am: 14a42ed03a am: b57eb6c4e5 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452417 Change-Id: I55247ad1f06ff53423e767f603b96fe57c102e9d
2020-10-26Merge "Add GetDsuMetadataKeyDir()" am: adb1b891a8 am: 76621fa1e5 am: 894bccb0baYo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452416 Change-Id: I687f82dace8c7b5ecdebe688c03ad15a0a8e9ebd
2020-10-26Merge "Destroy DSU metadata encryption key when wiping an installation" am: ↵Yo Chiang
5dc456a684 am: 14a42ed03a Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452417 Change-Id: If52cd9766c5534fa633c12f3ac18dd1fc38a98ab
2020-10-26Merge "Add GetDsuMetadataKeyDir()" am: adb1b891a8 am: 76621fa1e5Yo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452416 Change-Id: I3f8e4eb2de34011098241caea16837bf85dcf4dc
2020-10-26Merge "Destroy DSU metadata encryption key when wiping an installation" am: ↵Yo Chiang
5dc456a684 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452417 Change-Id: Iebf12bf7e093ca4e67be6a25180fc49d48491ea9
2020-10-26Merge "Add GetDsuMetadataKeyDir()" am: adb1b891a8Yo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452416 Change-Id: I31b67407c730690b8ae7ddaffdf569d70ca18409
2020-10-26Merge "Destroy DSU metadata encryption key when wiping an installation"Yo Chiang
2020-10-26Merge "Add GetDsuMetadataKeyDir()"Yo Chiang
2020-10-22Add constants kDsuScratch and kDsuUserdataYo Chiang
These partitions names are special devices used by DSU. kDsuScratch is the scratch partition used by fs_mgr_overlayfs. kDsuUserdata is the userdata partition used by fs_mgr_fstab. fs_mgr_fstab.cpp:TransformFstabForDsu recognizes these special constants and skip handling these devices. Bug: 165925766 Test: Install and boot a DSU. Change-Id: I08fc653218fb47acbb370a4470259eae3970c91f
2020-10-22Add "create-partition" debugging API to gsi_toolYo Chiang
`gsi_tool create-partition [-p <name>] [-s <size>] [--readwrite]` is a debugging API used to create DSU partitions. Readwritable partitions such as userdata and scratch should be created with the "--readwrite" flag. This is like `gsi_tool install` but `create-partition` is more primitive and does less things (doesn't auto-create userdata, doesn't auto-reboot.) This is a debugging API so don't depend on its behavior and don't expect it to be stable. Bug: 165925766 Test: adb shell gsi_tool create-partition --readwrite \ --partition scratch --size $((200 * 1024 * 1024)) Change-Id: I9ce463220534ba46c948ea48e9c52bdc0ff762b1
2020-10-13Merge "Make GetActiveDsu() static inline" am: 53ad534d6f am: bb1950da87 am: ↵Yo Chiang
cb2cd41942 am: 542566bb81 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452415 Change-Id: Ie1357cec82974414708ff9982ece4b12924ad928
2020-10-13Merge "Make GetActiveDsu() static inline" am: 53ad534d6f am: bb1950da87 am: ↵Yo Chiang
cb2cd41942 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452415 Change-Id: Iae7dda1f312e87cc28e557ef97401cb1dbf7914b
2020-10-13Merge "Make GetActiveDsu() static inline" am: 53ad534d6f am: bb1950da87Yo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452415 Change-Id: Idc67ebeb75d93ab4a41b9f6279b1db67a6c53c51
2020-10-13Merge "Make GetActiveDsu() static inline" am: 53ad534d6fYo Chiang
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452415 Change-Id: Ic4ac3cf5ae153b45730bcf39ce78f92a4a7ccb0f
2020-10-13Destroy DSU metadata encryption key when wiping an installationYo Chiang
Call IVold::destroyDsuMetadataKey() to destroy the old key. This ensures that wiping and reinstalling a DSU system would generate different metadata encryption keys, albeit using the same key dir. Bug: 168571434 Test: 1. Install a DSU system. 2. Boot the DSU system and reboot back to the host system. 3. Wipe the DSU installation. 4. DSU metadata key dir /metadata/vold/metadata_encryption/dsu/dsu is destroyed. Change-Id: I5b66c6ac440f857a7bb22341d5dc70480a4075b2
2020-10-13Add GetDsuMetadataKeyDir()Yo Chiang
* GetDsuMetadataKeyDir() returns the metadata encryption key dir to be used by DSU. This function is called by libfstab during second-stage-init for the guest DSU system to determine the userdata mount flags. This is called by vold to clean up the key dir when removing a DSU installation. * DsuMetadataKeyDirFile() returns the metadata encryption key dir indicator file. During installation, gsid (host) publish the key dir to be used by the guest DSU system to this file. * DefaultDsuMetadataKeyDir() returns the default key dir. gsid calls this function to build the key dir to be used by the guest DSU system. * DSU metadata encryption key dir must be a subdirectory of "/metadata/vold/metadata_encryption/dsu/". Bug: 168571434 Test: Build and boot. Change-Id: I4d7f8084d93140d19886e29a9ac890bcdbad4e11
2020-10-13Merge "Make GetActiveDsu() static inline"Yo Chiang
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: aae9987282 -s ours am: ↵Xin Li
6437f8f510 -s ours am: c1ee10fb27 -s ours am skip reason: Change-Id I6c3aad85be5a9ab663b658088b200935cd9085f0 with SHA-1 fe46276807 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/gsid/+/12797465 Change-Id: Iba64736dbd782774933bbf72048b2c2facaad963
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: aae9987282 -s ours am: ↵Xin Li
6437f8f510 -s ours am skip reason: Change-Id I6c3aad85be5a9ab663b658088b200935cd9085f0 with SHA-1 fe46276807 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/gsid/+/12797465 Change-Id: I7e087d79a547baa6b7fefd1306efa5e7f78cc0bc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: aae9987282 -s oursXin Li
am skip reason: Change-Id I6c3aad85be5a9ab663b658088b200935cd9085f0 with SHA-1 fe46276807 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/gsid/+/12797465 Change-Id: Ic873598e2e197784ab87b53f71afb238e640330c
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I6c3aad85be5a9ab663b658088b200935cd9085f0 Change-Id: I89c4838f61a452a0733f421b55f47c92b83623c2
2020-10-08Remove vts10 related configs am: bb923026fd am: 7b8a4939a4 am: 011b6529b1 ↵Dan Shi
am: 5f9f0b4501 Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1455084 Change-Id: I744665b8a5549011fdc0dd0cf09c74716734e422
2020-10-08Remove vts10 related configs am: bb923026fd am: 7b8a4939a4 am: 011b6529b1Dan Shi
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1455084 Change-Id: I21b92f8ceea31c3c9c3d601d64323eff691c83cd
2020-10-08Remove vts10 related configs am: bb923026fd am: 7b8a4939a4Dan Shi
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1455084 Change-Id: I83da0e7bd1b86932e4b7e10368647c3e158cb2e1
2020-10-08Remove vts10 related configs am: bb923026fdDan Shi
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1455084 Change-Id: Id7f584031f5fae4191bdc159540de7156cd00278
2020-10-08Remove vts10 related configsDan Shi
vts_config is a test wrapper used for VTS10 harness. The test is replaced by generic gtest and vts10 harness will be removed from S release. VtsGsiBootTest is replaced by vts_gsi_boot_test. Bug: 169584384 Test: build Change-Id: Ie02852be511fcfe49e10755d83d690d65ff95f6f
2020-10-07Make GetActiveDsu() static inlineYo Chiang
So that libraries such as `libfstab` who only links to header-only library `libgsi_headers` can still call GetActiveDsu(). Bug: 168571434 Test: Build pass Change-Id: Ifa637320813a7a04cfb37f05b77cd90e5546b095
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 11:37:32 +0000