From 5855408946cb80b311abc83ffebe41a9b12cd96e Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 13 Nov 2012 15:29:19 +0000
Subject: [PATCH] change desc attr name to description

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14317 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-buildkit/bin/buildkit                               | 6 +++---
 xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit
index d425f8328..2de8ffb80 100755
--- a/xCAT-buildkit/bin/buildkit
+++ b/xCAT-buildkit/bin/buildkit
@@ -81,7 +81,7 @@ $::deploy_dir = $::build_dir; #kitname appended by validate_bldkitconf routine
                value_desc=>'Must be: Generic Name String',
                mandatory=>1,
                cp_to_kitconfig=>1},
-              desc => {
+              description => {
                description=>'The kit description',
                value_desc=>'any string',
                mandatory=>0,
@@ -142,7 +142,7 @@ $::deploy_dir = $::build_dir; #kitname appended by validate_bldkitconf routine
                value_desc=>'any string',
                mandatory=>1,
                cp_to_kitconfig=>1},
-              desc => {
+              description => {
                description=>'The component description.  The description is added to the meta-package.',
                value_desc=>'any string',
                mandatory=>0,
@@ -1608,7 +1608,7 @@ sub gen_kitcomp_spec
         s/<<<INSERT_kitcomponent_ospkgdeps_HERE>>>/$comp->{ospkgdeps}/;
         s/<<<INSERT_kitcomponent_kitpkgdeps_HERE>>>/$comp->{kitpkgdeps}/;
         s/<<<INSERT_kitcomponent_kitcompdeps_HERE>>>/$comp->{kitcompdeps}/;
-        s/<<<INSERT_kitcomponent_desc_HERE>>>/$comp->{desc}/;
+        s/<<<INSERT_kitcomponent_desc_HERE>>>/$comp->{description}/;
         s/<<<INSERT_kitcomponent_preinstall_script_HERE>>>/$prescript/;
         s/<<<INSERT_kitcomponent_postinstall_script_HERE>>>/$postscript/;
         s/<<<INSERT_kitcomponent_preupgrade_script_HERE>>>/$preupscript/;
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
index 033b6c2e3..9c7731eba 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
@@ -10,7 +10,7 @@
 # 
 # kit attributes:
 #    basename        (mandatory) Kit base name. e.g., kit-lsf
-#    desc            (optional)  Kit description.
+#    description     (optional)  Kit description.
 #    version         (mandatory) Kit version. e.g., 1.0
 #    ostype          (mandatory) Kit OS type.  Must be Linux.
 #                      AIX is currently not supported.
@@ -22,7 +22,7 @@
 #                       <Kit Build Directory>/other_files
 kit:
    basename=<<<INSERT_kitbasename_HERE>>>
-   desc=description for <<<INSERT_kitbasename_HERE>>>
+   description=description for <<<INSERT_kitbasename_HERE>>>
    version=1.0
    ostype=Linux
    kitdeployparams=sample/kitdeployparams.lst
@@ -63,7 +63,7 @@ kitrepo:
 #
 # kitcomponent attributes:
 #    basename        (mandatory) Kit component base name
-#    desc            (optional)  Kit component description
+#    description     (optional)  Kit component description
 #    version         (mandatory) Kit component version
 #    release         (mandatory) Kit component release
 #    serverroles     (mandatory) Comma-separated list of servers that this
@@ -100,7 +100,7 @@ kitrepo:
 #                         preupgrade, postupgrade, postbootscripts
 kitcomponent:
     basename=<<<INSERT_kitcomponent_basename_HERE>>>
-    desc=description for component <<<INSERT_kitcomponent_basename_HERE>>>
+    description=description for component <<<INSERT_kitcomponent_basename_HERE>>>
     version=1.0
     release=1
     serverroles=compute