From b9c6cf3dd3da347fbe33132af7deb2cbf8549039 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 6 Jun 2014 12:19:15 +0400 Subject: [PATCH] mnt: Strip commas from options string Not all filesystems like it. Other than this options in the image just look cleaner. Signed-off-by: Pavel Emelyanov --- mount.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mount.c b/mount.c index f8fa407f6..13e078123 100644 --- a/mount.c +++ b/mount.c @@ -795,6 +795,19 @@ uns: return &fstypes[0]; } +static char *strip(char *opt) +{ + int len; + + len = strlen(opt); + if (len > 1 && opt[len - 1] == ',') + opt[len - 1] = '\0'; + if (opt[0] == ',') + opt++; + + return opt; +} + static int dump_one_mountpoint(struct mount_info *pm, int fd) { MntEntry me = MNT_ENTRY__INIT; @@ -813,7 +826,7 @@ static int dump_one_mountpoint(struct mount_info *pm, int fd) me.root = pm->root; me.mountpoint = pm->mountpoint + 1; me.source = pm->source; - me.options = pm->options; + me.options = strip(pm->options); me.shared_id = pm->shared_id; me.has_shared_id = true; me.master_id = pm->master_id;