summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-02-12 09:14:13 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-02-12 09:33:44 +0100
commite5c73e0fe1e6ae1b55b3d8b9814bd0fed879e7e1 (patch)
treee3503be84f1dcc295b2b3ae032fc383f4b73476e /lib
parentc1156d841fbc0c9d769f4f5b0cdca8fd4dd15cec (diff)
downloadbarebox-e5c73e0fe1e6ae1b55b3d8b9814bd0fed879e7e1.tar.gz
barebox-e5c73e0fe1e6ae1b55b3d8b9814bd0fed879e7e1.tar.xz
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 <s.hauer@pengutronix.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/cmdlinepart.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/cmdlinepart.c b/lib/cmdlinepart.c
index df6f17af39..d7d444115f 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);