Merge "fs_mgr: Don't run e2fsck inside SDK system images." (ebb46d76) · Commits · e / os / android_system_core

fs_mgr/fs_mgr.c

+16 −7

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,14 @@ static void check_fs(char blk_device, char fs_type, char *target)
	umount(target);		umount(target);
	}		}

			/*
			* Some system images do not have e2fsck for licensing reasons
			* (e.g. recent SDK system images). Detect these and skip the check.
			*/
			if (access(E2FSCK_BIN, X_OK)) {
			INFO("Not running %s on %s (executable not in system image)\n",
			E2FSCK_BIN, blk_device);
			} else {
	INFO("Running %s on %s\n", E2FSCK_BIN, blk_device);		INFO("Running %s on %s\n", E2FSCK_BIN, blk_device);

	ret = android_fork_execvp_ext(ARRAY_SIZE(e2fsck_argv), e2fsck_argv,		ret = android_fork_execvp_ext(ARRAY_SIZE(e2fsck_argv), e2fsck_argv,
	@@ -127,6 +135,7 @@ static void check_fs(char blk_device, char fs_type, char *target)
	ERROR("Failed trying to run %s\n", E2FSCK_BIN);		ERROR("Failed trying to run %s\n", E2FSCK_BIN);
	}		}
	}		}
			}

	return;		return;
	}		}