ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: Error out if unable to determine slot_suffix"

Browse source
This commit is contained in:
David Zeuthen 2015-09-14 15:33:35 +00:00 • committed by Gerrit Code Review
commit d906b2973b
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
fs_mgr/fs_mgr_slotselect.c
View file

@ -78,10 +78,11 @@ static int get_active_slot_suffix_from_misc(struct fstab *fstab,
return 0; return 0;
} }
// Gets slot_suffix from either the kernel cmdline / firmware, the // Gets slot_suffix from either the kernel cmdline / firmware or the
// misc partition or built-in fallback. // misc partition. Sets |out_suffix| on success and returns 0. Returns
static void get_active_slot_suffix(struct fstab *fstab, char *out_suffix, // -1 if slot_suffix could not be determined.
size_t suffix_len) static int get_active_slot_suffix(struct fstab *fstab, char *out_suffix,
size_t suffix_len)
{ {
char propbuf[PROPERTY_VALUE_MAX]; char propbuf[PROPERTY_VALUE_MAX];
@ -91,30 +92,19 @@ static void get_active_slot_suffix(struct fstab *fstab, char *out_suffix,
property_get("ro.boot.slot_suffix", propbuf, ""); property_get("ro.boot.slot_suffix", propbuf, "");
if (propbuf[0] != '\0') { if (propbuf[0] != '\0') {
strncpy(out_suffix, propbuf, suffix_len); strncpy(out_suffix, propbuf, suffix_len);
return; return 0;
} }
// If we couldn't get the suffix from the kernel cmdline, try the // If we couldn't get the suffix from the kernel cmdline, try the
// the misc partition. // the misc partition.
if (get_active_slot_suffix_from_misc(fstab, out_suffix, suffix_len) == 0) { if (get_active_slot_suffix_from_misc(fstab, out_suffix, suffix_len) == 0) {
INFO("Using slot suffix \"%s\" from misc\n", out_suffix); INFO("Using slot suffix \"%s\" from misc\n", out_suffix);
return; return 0;
} }
// If that didn't work, fall back to _a. The reasoning here is ERROR("Error determining slot_suffix\n");
// that since the fstab has the slotselect option set (otherwise
// we wouldn't end up here) we must assume that partitions are return -1;
// indeed set up for A/B. This corner-case is important because we
// may be on this codepath on newly provisioned A/B devices where
// misc isn't set up properly (it's just zeroes) and the
// bootloader does not (yet) natively support A/B.
//
// Why '_a'? Because that's what system/extras/boot_control_copy
// is using and since the bootloader isn't A/B aware we assume
// slots are set up this way.
WARNING("Could not determine slot suffix, falling back to \"_a\"\n");
strncpy(out_suffix, "_a", suffix_len);
return;
} }
// Updates |fstab| for slot_suffix. Returns 0 on success, -1 on error. // Updates |fstab| for slot_suffix. Returns 0 on success, -1 on error.
@ -130,7 +120,10 @@ int fs_mgr_update_for_slotselect(struct fstab *fstab)
if (!got_suffix) { if (!got_suffix) {
memset(suffix, '\0', sizeof(suffix)); memset(suffix, '\0', sizeof(suffix));
get_active_slot_suffix(fstab, suffix, sizeof(suffix) - 1); if (get_active_slot_suffix(fstab, suffix,
sizeof(suffix) - 1) != 0) {
return -1;
}
got_suffix = 1; got_suffix = 1;
} }