Skip to content
Commit 0d71832e authored by Tristan Schmelcher's avatar Tristan Schmelcher Committed by Richard Weinberger
Browse files

uml: Simplify tempdir logic.



Inferring the mount hierarchy correctly from /proc/mounts is hard when MS_MOVE
may have been used, and the previous code did it wrongly. This change simplifies
the logic to only require that /dev/shm be _on_ tmpfs (which can be checked
trivially with statfs) rather than that it be a _mountpoint_ of tmpfs, since
there isn't a compelling reason to be that strict. We also now check for tmpfs
on whatever directory we ultimately use so that the user is better informed.

This change also moves the more standard TMPDIR environment variable check ahead
of the others.

Applies to 3.12.

Signed-off-by: default avatarTristan Schmelcher <tschmelcher@google.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent a798c10f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment