Merge "fs_mgr: fix fs_mgr avb_keys parsing problem" (c8964edb) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_fstab.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -307,6 +307,8 @@ void ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
		} else {
		entry->logical_blk_size = val;
		}
		} else if (StartsWith(flag, "avb_keys=")) { // must before the following "avb"
		entry->avb_keys = arg;
		} else if (StartsWith(flag, "avb")) {
		entry->fs_mgr_flags.avb = true;
		entry->vbmeta_partition = arg;
		@@ -325,8 +327,6 @@ void ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
		}
		} else if (StartsWith(flag, "zram_backing_dev_path=")) {
		entry->zram_backing_dev_path = arg;
		} else if (StartsWith(flag, "avb_keys=")) {
		entry->avb_keys = arg;
		} else {
		LWARNING << "Warning: unknown flag: " << flag;
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -948,13 +948,14 @@ TEST(fs_mgr, ReadFstabFromFile_FsMgrOptions_Avb) {
		ASSERT_TRUE(tf.fd != -1);
		std::string fstab_contents = R"fs(
		source none0 swap defaults avb=vbmeta_partition
		source none1 swap defaults avb_keys=/path/to/test.avbpubkey
		)fs";

		ASSERT_TRUE(android::base::WriteStringToFile(fstab_contents, tf.path));

		Fstab fstab;
		EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));
		ASSERT_EQ(1U, fstab.size());
		ASSERT_EQ(2U, fstab.size());

		auto entry = fstab.begin();
		EXPECT_EQ("none0", entry->mount_point);
		@@ -964,6 +965,12 @@ source none0 swap defaults avb=vbmeta_partition
		EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags));

		EXPECT_EQ("vbmeta_partition", entry->vbmeta_partition);
		entry++;

		EXPECT_EQ("none1", entry->mount_point);
		FstabEntry::FsMgrFlags empty_flags = {}; // no flags should be set for avb_keys.
		EXPECT_TRUE(CompareFlags(empty_flags, entry->fs_mgr_flags));
		EXPECT_EQ("/path/to/test.avbpubkey", entry->avb_keys);
		}

		TEST(fs_mgr, ReadFstabFromFile_FsMgrOptions_KeyDirectory) {