From f0a0817f5d50d29219ba414173c98944b950c3c0 Mon Sep 17 00:00:00 2001 From: linggao Date: Wed, 4 Aug 2010 13:42:55 +0000 Subject: [PATCH] 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 --- .../share/xcat/install/SL/compute.pkglist | 5 +++++ .../share/xcat/install/SL/compute.tmpl | 4 ---- .../share/xcat/install/centos/all.pkglist | 6 ++++++ .../share/xcat/install/centos/all.tmpl | 5 ----- .../share/xcat/install/centos/compute.pkglist | 5 +++++ .../share/xcat/install/centos/compute.tmpl | 4 ---- .../share/xcat/install/centos/iscsi.pkglist | 5 +++++ .../share/xcat/install/centos/iscsi.tmpl | 4 ---- .../share/xcat/install/centos/storage.pkglist | 21 +++++++++++++++++++ .../share/xcat/install/centos/storage.tmpl | 20 ------------------ .../share/xcat/install/centos/xen.pkglist | 5 +++++ .../share/xcat/install/centos/xen.tmpl | 4 ---- .../share/xcat/install/esx/esx.pkglist | 3 ++- xCAT-server/share/xcat/install/esx/esx.tmpl | 1 - 14 files changed, 49 insertions(+), 43 deletions(-) diff --git a/xCAT-server/share/xcat/install/SL/compute.pkglist b/xCAT-server/share/xcat/install/SL/compute.pkglist index 6f327ab58..9819c7adf 100644 --- 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 diff --git a/xCAT-server/share/xcat/install/SL/compute.tmpl b/xCAT-server/share/xcat/install/SL/compute.tmpl index a73ca392c..efd5310de 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/centos/all.pkglist b/xCAT-server/share/xcat/install/centos/all.pkglist index 741044ce7..ad82b1a33 100644 --- 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 diff --git a/xCAT-server/share/xcat/install/centos/all.tmpl b/xCAT-server/share/xcat/install/centos/all.tmpl index 99ed3ddd9..06f62f972 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/centos/compute.pkglist b/xCAT-server/share/xcat/install/centos/compute.pkglist index cf978e0e6..85d0c4016 100644 --- 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 diff --git a/xCAT-server/share/xcat/install/centos/compute.tmpl b/xCAT-server/share/xcat/install/centos/compute.tmpl index 89d1593da..b0e9a9539 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/centos/iscsi.pkglist b/xCAT-server/share/xcat/install/centos/iscsi.pkglist index 1f8b2cc5c..f9c6e72da 100644 --- 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 diff --git a/xCAT-server/share/xcat/install/centos/iscsi.tmpl b/xCAT-server/share/xcat/install/centos/iscsi.tmpl index 538438a3d..5559ed194 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/centos/storage.pkglist b/xCAT-server/share/xcat/install/centos/storage.pkglist index 1f8b2cc5c..2c392ecc5 100644 --- 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 diff --git a/xCAT-server/share/xcat/install/centos/storage.tmpl b/xCAT-server/share/xcat/install/centos/storage.tmpl index 344e7d421..bc4ec3c15 100644 --- 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 diff --git a/xCAT-server/share/xcat/install/centos/xen.pkglist b/xCAT-server/share/xcat/install/centos/xen.pkglist index ac1f20898..6d3f1c8aa 100644 --- 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 diff --git a/xCAT-server/share/xcat/install/centos/xen.tmpl b/xCAT-server/share/xcat/install/centos/xen.tmpl index 5e34177c5..100d13962 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/esx/esx.pkglist b/xCAT-server/share/xcat/install/esx/esx.pkglist index 0519ecba6..d6fcc2e17 100644 --- a/xCAT-server/share/xcat/install/esx/esx.pkglist +++ b/xCAT-server/share/xcat/install/esx/esx.pkglist @@ -1 +1,2 @@ - \ No newline at end of file +#Please make sure there is a space between @ and group name +@base diff --git a/xCAT-server/share/xcat/install/esx/esx.tmpl b/xCAT-server/share/xcat/install/esx/esx.tmpl index 6e933e052..39b6959ea 100644 --- 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