Commit df1a5b22 authored Mar 18, 2015 by Mårten Kongstad Committed by Zoran Jovanovic Oct 07, 2015

RRO: idmap: allow flock(2) to block

During creation of an idmap an advisory lock is applied on the
output file using flock(2). This commit removes the LOCK_NB flag
from the call to flock(2).

The reason for this is that if the function were to return
EWOULDBLOCK, the entire idmap operation would be aborted leading
to the device booting without the correct overlay packages applied.

Change-Id: Iad319779976e950d4354e4f60b30439f6f208b77

parent c9390c8b

cmds/idmap/create.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ namespace {
		ALOGD("error: fchmod %s: %s\n", path, strerror(errno));
		goto fail;
		}
		if (TEMP_FAILURE_RETRY(flock(fd, LOCK_EX \| LOCK_NB)) != 0) {
		if (TEMP_FAILURE_RETRY(flock(fd, LOCK_EX)) != 0) {
		ALOGD("error: flock %s: %s\n", path, strerror(errno));
		goto fail;
		}