From e5c73e0fe1e6ae1b55b3d8b9814bd0fed879e7e1 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 12 Feb 2015 09:14:13 +0100 Subject: [PATCH] cmndlinepart: skip devname if partstr already contains it When the partition name already starts with "devname." skip this when adding the partition. Signed-off-by: Sascha Hauer --- lib/cmdlinepart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/cmdlinepart.c b/lib/cmdlinepart.c index df6f17af3..d7d444115 100644 --- a/lib/cmdlinepart.c +++ b/lib/cmdlinepart.c @@ -61,7 +61,8 @@ int cmdlinepart_do_parse_one(const char *devname, const char *partstr, return -EINVAL; } - if (partition_flags & CMDLINEPART_ADD_DEVNAME) + if ((partition_flags & CMDLINEPART_ADD_DEVNAME) && + strncmp(devname, partstr, strlen(devname))) sprintf(buf, "%s.", devname); memcpy(buf + strlen(buf), partstr, end - partstr);