From 4f20898b4dcae36b1408af49e2daa6b2a84c5fe4 Mon Sep 17 00:00:00 2001
From: Cyber-SiKu <Cyber-SiKu@outlook.com>
Date: Fri, 6 Jan 2023 17:02:27 +0800
Subject: [PATCH] [fix]curvefs:make image/create fs error

Signed-off-by: Cyber-SiKu <Cyber-SiKu@outlook.com>
---
 curvefs/conf/tools.conf                        | 1 +
 curvefs/src/tools/create/curvefs_create_fs.cpp | 1 +
 util/image.sh                                  | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/curvefs/conf/tools.conf b/curvefs/conf/tools.conf
index 65d8e6e1e5..52cbf70590 100644
--- a/curvefs/conf/tools.conf
+++ b/curvefs/conf/tools.conf
@@ -24,6 +24,7 @@ volumeName=volume
 volumeUser=user
 volumePassword=password
 volumeBlockGroupSize=134217728
+volumeCluster=127.0.0.1:6666,127.0.0.1:6667,127.0.0.1:6668
 # support |AtStart| and |AtEnd|
 volumeBitmapLocation=AtStart
 # s3
diff --git a/curvefs/src/tools/create/curvefs_create_fs.cpp b/curvefs/src/tools/create/curvefs_create_fs.cpp
index 8f991c79a7..42e47fab8f 100644
--- a/curvefs/src/tools/create/curvefs_create_fs.cpp
+++ b/curvefs/src/tools/create/curvefs_create_fs.cpp
@@ -122,6 +122,7 @@ void CreateFsTool::AddUpdateFlags() {
     AddUpdateFlagsFunc(curvefs::tools::SetVolumePassword);
     AddUpdateFlagsFunc(curvefs::tools::SetVolumeBlockSize);
     AddUpdateFlagsFunc(curvefs::tools::SetVolumeBitmapLocation);
+    AddUpdateFlagsFunc(curvefs::tools::SetVolumeCluster);
     AddUpdateFlagsFunc(curvefs::tools::SetS3_ak);
     AddUpdateFlagsFunc(curvefs::tools::SetS3_sk);
     AddUpdateFlagsFunc(curvefs::tools::SetS3_endpoint);
diff --git a/util/image.sh b/util/image.sh
index 7ae66d6805..c9ac156526 100644
--- a/util/image.sh
+++ b/util/image.sh
@@ -103,5 +103,7 @@ do
     tmpl $dsv "$dir/$file" "$prefix/conf/$dst"
 done
 
+cp conf/client.conf $prefix/conf/curvebs-client.conf
+
 docker pull opencurvedocker/curve-base:$3
 docker build -t "$2" "$docker_prefix"