From 4322c2b5531ea0fdfb6376df7c482b112d009e4b Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Thu, 14 May 2015 04:11:52 -0400
Subject: [PATCH] remove install|statelite|netboot from usage statements

---
 xCAT-server/lib/xcat/plugins/DBobjectdefs.pm | 12 ++++--------
 xCAT-server/lib/xcat/plugins/grub2.pm        |  2 +-
 xCAT-server/lib/xcat/plugins/pxe.pm          |  2 +-
 xCAT-server/lib/xcat/plugins/xnba.pm         |  2 +-
 xCAT-server/lib/xcat/plugins/yaboot.pm       |  2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index 196806bde..ddd4a39f0 100755
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -4047,11 +4047,9 @@ sub defmk_usage
       "      [-d | --dynamic] [-w attr==val [-w attr=~val] ...]";
     $rsp->{data}->[4] =
       "      [-f | --force] [noderange] [attr=val [attr=val...]]";
-    $rsp->{data}->[5] = 
-      "      [-u provmethod=<install|netboot|statelite> profile=<xxx> [osvers=value] [osarch=value]]\n";
-    $rsp->{data}->[6] =
+    $rsp->{data}->[5] =
       "\nThe following data object types are supported by xCAT.\n";
-    my $n = 7;
+    my $n = 6;
 
     foreach my $t (sort(keys %{xCAT::Schema::defspec}))
     {
@@ -4097,11 +4095,9 @@ sub defch_usage
       "    [-z | --stanza] [-m | --minus] [-p | --plus]";
     $rsp->{data}->[5] =
       "    [-w attr==val [-w attr=~val] ... ] [noderange] [attr=val [attr=val...]]\n";
-    $rsp->{data}->[6] = 
-      "    [-u [provmethod=<install|netboot|statelite>]|[profile=<xxx>]|[osvers=value]|[osarch=value]]";
-    $rsp->{data}->[7] =
+    $rsp->{data}->[6] =
       "\nThe following data object types are supported by xCAT.\n";
-    my $n = 8;
+    my $n = 7;
 
     foreach my $t (sort(keys %{xCAT::Schema::defspec}))
     {
diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index c3b128b48..233a5ade4 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -23,7 +23,7 @@ my $globaltftpdir = xCAT::TableUtils->getTftpDir();
 
 
 my %usage = (
-    "nodeset" => "Usage: nodeset <noderange> [install|shell|boot|runcmd=bmcsetup|netboot|iscsiboot|osimage[=<imagename>]|offline]",
+    "nodeset" => "Usage: nodeset <noderange> [shell|boot|runcmd=bmcsetup|iscsiboot|osimage[=<imagename>]|offline]",
 );
 sub handled_commands {
     # process noderes:netboot like "grub2-<transfer protocol>"
diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm
index bdeb8034f..abc766aef 100644
--- a/xCAT-server/lib/xcat/plugins/pxe.pm
+++ b/xCAT-server/lib/xcat/plugins/pxe.pm
@@ -16,7 +16,7 @@ my $globaltftpdir = xCAT::TableUtils->getTftpDir();
 #my $dhcpver = 3;
 
 my %usage = (
-    "nodeset" => "Usage: nodeset <noderange> [install|shell|boot|runcmd=bmcsetup|netboot|iscsiboot|osimage[=<imagename>]|statelite|offline]",
+    "nodeset" => "Usage: nodeset <noderange> [shell|boot|runcmd=bmcsetup|iscsiboot|osimage[=<imagename>]|offline]",
 );
 sub handled_commands {
   return {
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 8ed6da148..084ae60ac 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -18,7 +18,7 @@ my $globaltftpdir = xCAT::TableUtils->getTftpDir();
 #my $dhcpver = 3;
 
 my %usage = (
-    "nodeset" => "Usage: nodeset <noderange> [install|shell|boot|runcmd=bmcsetup|netboot|iscsiboot|osimage[=<imagename>]|statelite|offline]",
+    "nodeset" => "Usage: nodeset <noderange> [shell|boot|runcmd=bmcsetup|iscsiboot|osimage[=<imagename>]|offline]",
 );
 sub handled_commands {
   return {
diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index 319d363bd..bed779b5b 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -20,7 +20,7 @@ my $globaltftpdir = xCAT::TableUtils->getTftpDir();
 #my $dhcpver = 3;
 
 my %usage = (
-    "nodeset" => "Usage: nodeset <noderange> [install|shell|boot|runcmd=bmcsetup|netboot|iscsiboot|osimage[=<imagename>]|offline]",
+    "nodeset" => "Usage: nodeset <noderange> [shell|boot|runcmd=bmcsetup|iscsiboot|osimage[=<imagename>]|offline]",
 );
 sub handled_commands {
   return {