]> git.karo-electronics.de Git - karo-tx-linux.git/commit
init: reduce PARTUUID min length to 1 from 36
authorStephen Warren <swarren@nvidia.com>
Fri, 12 Oct 2012 04:22:53 +0000 (15:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Oct 2012 02:06:02 +0000 (13:06 +1100)
commit96d972af96e05033e9d76c927729fbd12c6daf73
tree3172ee10aec8981f32630b4b1bb85adc9df63a3a
parentf38f4d0313fd7f0a7fe3bc4ee3e89ded3521bcaa
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: Jens Axboe <axboe@kernel.dk>
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>
init/do_mounts.c