From d950d83250db3a179c4b629fd32cd7bc8149997e Mon Sep 17 00:00:00 2001 From: Alexandre Marangone Date: Fri, 15 Feb 2013 12:24:01 -0800 Subject: [PATCH] ceph-disk-prepare: always force mkfs.xfs Signed-off-by: Alexandre Marangone --- src/ceph-disk-prepare | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare index 7dd1cba071734..da63069909e92 100755 --- a/src/ceph-disk-prepare +++ b/src/ceph-disk-prepare @@ -640,6 +640,8 @@ def prepare_dev( ] if mkfs_args is not None: args.extend(mkfs_args.split()) + #always force + args.extend(['-f']) else: args.extend(MKFS_ARGS.get(fstype, [])) args.extend([ @@ -652,6 +654,10 @@ def prepare_dev( except subprocess.CalledProcessError as e: raise PrepareError(e) + #remove whitespaces from mount_options + if mount_options is not None: + mount_options = "".join(mount_options.split()) + path = mount(dev=dev, fstype=fstype, options=mount_options) try: -- 2.39.5