updatenode support groups for centos,SL and esx

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6976 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-04 13:42:55 +00:00 · 2010-08-04 13:42:55 +00:00 · f0a0817f5d
commit f0a0817f5d
parent 8a3d807216
14 changed files with 49 additions and 43 deletions
--- a/xCAT-server/share/xcat/install/SL/compute.pkglist
+++ b/xCAT-server/share/xcat/install/SL/compute.pkglist
@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
--- a/xCAT-server/share/xcat/install/SL/compute.tmpl
+++ b/xCAT-server/share/xcat/install/SL/compute.tmpl
@ -146,10 +146,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:../scripts/pre.rh#
--- a/xCAT-server/share/xcat/install/centos/all.pkglist
+++ b/xCAT-server/share/xcat/install/centos/all.pkglist
@ -1,3 +1,9 @@
+#Please make sure there is a space between @ and group name
+@Everything
+@ Everything
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 #kernel-smp
 autofs
 ksh
--- a/xCAT-server/share/xcat/install/centos/all.tmpl
+++ b/xCAT-server/share/xcat/install/centos/all.tmpl
@ -150,11 +150,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@Everything
-@ Everything
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
--- a/xCAT-server/share/xcat/install/centos/compute.pkglist
+++ b/xCAT-server/share/xcat/install/centos/compute.pkglist
@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 tcsh
 ntp
--- a/xCAT-server/share/xcat/install/centos/compute.tmpl
+++ b/xCAT-server/share/xcat/install/centos/compute.tmpl
@ -146,10 +146,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
--- a/xCAT-server/share/xcat/install/centos/iscsi.pkglist
+++ b/xCAT-server/share/xcat/install/centos/iscsi.pkglist
@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
--- a/xCAT-server/share/xcat/install/centos/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/centos/iscsi.tmpl
@ -149,10 +149,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
--- a/xCAT-server/share/xcat/install/centos/storage.pkglist
+++ b/xCAT-server/share/xcat/install/centos/storage.pkglist
@ -1,3 +1,9 @@
+#Please make sure there is a space between @ and group name
+@Everything
+@ Everything
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
@ -20,3 +26,18 @@ binutils
 openssh-server
 util-linux
 compat-libstdc++-33
+-kernel-xen
+-kmod-cmirror-xen
+-xen-devel
+-kmod-gnbd-xen
+-xen
+-libvirt-devel
+-libvirt-cim
+-gnome-applet-vm
+-kmod-gfs-xen
+-xen-libs
+-libvirt
+-virt-viewer
+-libvirt-python
+-python-virtinst
+-virt-manager
--- a/xCAT-server/share/xcat/install/centos/storage.tmpl
+++ b/xCAT-server/share/xcat/install/centos/storage.tmpl
@ -152,27 +152,7 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@Everything
-@ Everything
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
-kernel-xen
-kmod-cmirror-xen
-xen-devel
-kmod-gnbd-xen
-xen
-libvirt-devel
-libvirt-cim
-gnome-applet-vm
-kmod-gfs-xen
-xen-libs
-libvirt
-virt-viewer
-libvirt-python
-python-virtinst
-virt-manager

 %pre
 #!/bin/sh
--- a/xCAT-server/share/xcat/install/centos/xen.pkglist
+++ b/xCAT-server/share/xcat/install/centos/xen.pkglist
@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 uucp
 xen
--- a/xCAT-server/share/xcat/install/centos/xen.tmpl
+++ b/xCAT-server/share/xcat/install/centos/xen.tmpl
@ -146,10 +146,6 @@ reboot
 #end of section
 #
 %packages
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
--- a/xCAT-server/share/xcat/install/esx/esx.pkglist
+++ b/xCAT-server/share/xcat/install/esx/esx.pkglist
@ -1 +1,2 @@
- 
+#Please make sure there is a space between @ and group name
+@base
--- a/xCAT-server/share/xcat/install/esx/esx.tmpl
+++ b/xCAT-server/share/xcat/install/esx/esx.tmpl
@ -34,7 +34,6 @@ vmaccepteula
 #vmlicense --mode=file

 %packages
-@base
 #INCLUDE_DEFAULT_PKGLIST#

 %pre