diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 16:12:27 -0800 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-11-23 14:28:56 +0100 |
commit | 283f8fc03927b0ef42a2faa60a0df5ec8c612edb (patch) | |
tree | 4258ba54ada02d6f9d7291a3b2b0eac454e1bc08 /init/initramfs.c | |
parent | 1ad7e89940d5ac411928189e1a4a01901dbf590f (diff) |
init: reduce PARTUUID min length to 1 from 36
Reduce the minimum length for a root=PARTUUID= parameter to be considered
valid from 36 to 1. EFI/GPT partition UUIDs are always exactly 36
characters long, hence the previous limit. However, the next patch will
support DOS/MBR UUIDs too, which have a different, shorter, format.
Instead of validating any particular length, just ensure that at least
some non-empty value was given by the user.
Also, consider a missing UUID value to be a parsing error, in the same
vein as if /PARTNROFF exists and can't be parsed. As such, make both
error cases print a message and disable rootwait. Convert to pr_err while
we're at it.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Will Drewry <wad@chromium.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'init/initramfs.c')
0 files changed, 0 insertions, 0 deletions