From: yujian <yujian>
Date: Tue, 21 Nov 2006 08:45:49 +0000 (+0000)
Subject: The sixth field in the csv entry is "fsname", so just move fsname option to its position.
X-Git-Tag: v1_8_0_110~486^2~107
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=e9ebcf4513eadd27a27327b9206abaa78ea71c02;p=fs%2Flustre-release.git

The sixth field in the csv entry is "fsname", so just move fsname option to its position.
---

diff --git a/lustre/scripts/lmc2csv.pl b/lustre/scripts/lmc2csv.pl
index 05f24ee..9c740b4 100644
--- a/lustre/scripts/lmc2csv.pl
+++ b/lustre/scripts/lmc2csv.pl
@@ -243,31 +243,34 @@ foreach my $mds (@{$objs{"mds"}}) {
         $mkfs_options = " --param=\"$mkfs_options\"";
     }
 
+    my $fs_name="";
     my $mount_point = "$MOUNTPT/" . $mds->{"name"};
     if (defined($mtpt->{"node"})) {
-        $mkfs_options .= " --fsname=\"" . $mtpt->{"node"} . "\" ";
+        $fs_name = $mtpt->{"node"};
         $mount_point .= "_" . $mtpt->{"node"};
     }
     $mkfs_options =~ s/\s*$//;
 
     if ($COUNT == 1) {
         # mgs/mdt
-        printf "%s,%s,%s,%s,mgs|mdt,,,,--device-size=%s --noformat%s,,noauto\n", 
+        printf "%s,%s,%s,%s,mgs|mdt,%s,,,--device-size=%s --noformat%s,,noauto\n", 
         $mds->{"node"},
         lnet_options($nets[0]),
         $mds->{"dev"},
         $mount_point,
+        $fs_name,
         $mds->{"size"},
         $mkfs_options;
 
         push(@mgses, $nets[0]->{"nid"});
     } else {
         # mdt
-        printf "%s,%s,%s,%s,mdt,,\"%s\",,--device-size=%s --noformat%s,,noauto\n",
+        printf "%s,%s,%s,%s,mdt,%s,\"%s\",,--device-size=%s --noformat%s,,noauto\n",
         $mds->{"node"},
         lnet_options($nets[0]),
         $mds->{"dev"},
         $mount_point,
+        $fs_name,
         join(",", @mgses),
         $mds->{"size"},
         $mkfs_options;
@@ -293,20 +296,22 @@ foreach my $ost (@{$objs{"ost"}}) {
     }
     
     $ost->{"lov"} = (find_objs("lov", "name", $ost->{"lov"}, @{$objs{"lov"}}))[0];
+    my $fs_name="";
     my $mount_point = "$MOUNTPT/" . $ost->{"name"}, 
     my $mtpt = $ost->{"lov"}->{"mtpt"};
     if (defined($mtpt->{"node"})) {
-        $mkfs_options .= " --fsname=\"" . $mtpt->{"node"} . "\" ";
+        $fs_name = $mtpt->{"node"};
         $mount_point .= "_" . $mtpt->{"node"};
     }
     $mkfs_options =~ s/\s*$//;
     # find the net for this node
     my @nets = find_objs("net", "node", $ost->{"node"}, @{$objs{"net"}});
-    printf "%s,%s,%s,%s,ost,,\"%s\",,--device-size=%s --noformat%s,,\"%s\"\n", 
+    printf "%s,%s,%s,%s,ost,%s,\"%s\",,--device-size=%s --noformat%s,,\"%s\"\n", 
     $ost->{"node"},
     lnet_options($nets[0]),
     $ost->{"dev"},
     $mount_point,
+    $fs_name,
     join(",", @mgses),
     $ost->{"size"},
     $mkfs_options,