diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-09 07:09:06 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-09 07:09:06 +0000 |
| commit | 330953994dc9de039244b61d7976556215eff36b (patch) | |
| tree | cf80819eeabb636749e9e6dad02bf3f10d3c8028 | |
| parent | 47fd98ffe3c34973f4b631f586bb805cf12f8ea5 (diff) | |
| parent | 3c93569dc609ee27fd796b450918522c8c172514 (diff) | |
| download | extras-330953994dc9de039244b61d7976556215eff36b.tar.gz | |
Snap for 8559592 from 3c93569dc609ee27fd796b450918522c8c172514 to main-cg-testing-release
Change-Id: I6a7f6a206251040abc5d817d5fa9512e465454d7
| -rw-r--r-- | cppreopts/fstab.postinstall | 2 | ||||
| -rw-r--r-- | mtectrl/mtectrl.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cppreopts/fstab.postinstall b/cppreopts/fstab.postinstall index 81272ebb..c77c9083 100644 --- a/cppreopts/fstab.postinstall +++ b/cppreopts/fstab.postinstall @@ -18,4 +18,6 @@ #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> system /postinstall ext4 ro,nosuid,nodev,noexec slotselect_other,logical +system /postinstall erofs ro,nosuid,nodev,noexec slotselect_other,logical /dev/block/by-name/system /postinstall ext4 ro,nosuid,nodev,noexec slotselect_other + diff --git a/mtectrl/mtectrl.cc b/mtectrl/mtectrl.cc index 0738f9ec..4e722407 100644 --- a/mtectrl/mtectrl.cc +++ b/mtectrl/mtectrl.cc @@ -24,7 +24,7 @@ int main(int argc, char** argv) { if (argc != 2) { std::cerr << "Usage: " << argv[0] - << " [none|memtag|memtag_once|memtag_kernel|memtag_kernel_once]\n"; + << " none|memtag|memtag-once|memtag-kernel|memtag-kernel-once[,...]\n"; return 1; } std::string value = argv[1]; |