1 files changed, 13 insertions, 5 deletions
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
index 4c437737..ffb9619d 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
@@ -43,10 +43,11 @@ public class InitializeDiskTask extends Task {
 	private String serverName;
 	private String diskName;
 	private String fsType;
+	private String mountPoint;
 	private ServerUtil serverUtil;
 
 	public InitializeDiskTask(ClusterService clusterService, String clusterName, String serverName, String diskName,
-			String fsType) {
+			String fsType, String deviceMountPoint) {
 		// Reference contains "Server:disk"
 		super(clusterService, clusterName, TASK_TYPE.DISK_FORMAT, serverName + ":" + diskName, "Initialize disk "
 				+ serverName + ":" + diskName, false, false, false);
@@ -54,6 +55,7 @@ public class InitializeDiskTask extends Task {
 		setServerName(serverName);
 		setDiskName(diskName);
 		setFsType(fsType);
+		setMountpoint(deviceMountPoint);
 		taskInfo.setName(getId());
 		init();
 	}
@@ -117,10 +119,8 @@ public class InitializeDiskTask extends Task {
 	}
 
 	private void startInitializeDisk(String serverName) {
-		String fsTypeCommand = (getFsType().equals(GlusterConstants.FSTYPE_DEFAULT)) ? "" : " -t " + getFsType();
-		
-		String output = serverUtil.executeScriptOnServer(serverName, INITIALIZE_DISK_SCRIPT + fsTypeCommand + " "
-				+ getDiskName());
+		String output = serverUtil.executeScriptOnServer(serverName, INITIALIZE_DISK_SCRIPT + getFsType() + " "
+				+ mountPoint + " " + getDiskName() );
 		TaskStatus taskStatus = new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, output));
 		taskStatus.setPercentageSupported((getFsType().equals(GlusterConstants.FSTYPE_XFS)) ? false : true);
 		getTaskInfo().setStatus(taskStatus);
@@ -187,4 +187,12 @@ public class InitializeDiskTask extends Task {
 	public String getFsType() {
 		return fsType;
 	}
+	
+	public void setMountpoint(String deviceMountPoint) {
+		this.mountPoint = deviceMountPoint;
+	}
+	
+	public String getMountpoint() {
+		return mountPoint;
+	}
 }