diff options
| author | Alistair Strachan <astrachan@google.com> | 2018-11-27 17:33:46 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2018-11-28 19:05:58 +0000 |
| commit | 0685af0fd7fd42c0c67fd18bc2b537770f6f4f4e (patch) | |
| tree | 4bd80242a5e0dcde226cd350a486dddfaf36fd1d /fs_mgr/fs_mgr.cpp | |
| parent | 66a6d8877cdaf169a24e0e7157f50b551a7b70a2 (diff) | |
| download | system_core-0685af0fd7fd42c0c67fd18bc2b537770f6f4f4e.tar.gz system_core-0685af0fd7fd42c0c67fd18bc2b537770f6f4f4e.tar.bz2 system_core-0685af0fd7fd42c0c67fd18bc2b537770f6f4f4e.zip | |
Allow non-A/B, non-retrofit devices to override super_partition
Some devices we want to test on, like cuttlefish, may not have a
partition table on any block device Android can see. The partitions are
simply exposed as separate block devices. This means we need to be able
to override the super_partition name to a regular block device name even
on non-A/B devices.
Bug: 113175337
Test: boot test on cuttlefish
Change-Id: I6ff460d0ba7b1e26cb5d60ba446737aa49549c18
Diffstat (limited to 'fs_mgr/fs_mgr.cpp')
| -rw-r--r-- | fs_mgr/fs_mgr.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 8e57e1ed0..63102381b 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -1603,9 +1603,6 @@ std::string fs_mgr_get_super_partition_name(int slot) { } else if (slot == -1) { suffix = fs_mgr_get_slot_suffix(); } - if (suffix.empty()) { - LFATAL << "Super partition name can only be overridden on A/B devices."; - } return super_partition + suffix; } return LP_METADATA_DEFAULT_PARTITION_NAME; |