defect 3496107: remove the uninstall of OpenIPMI-tools and tftp-server, try to install conserver-xcat instead of conserver

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11949 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2012-03-23 01:26:09 +00:00
parent 71cf318ee9
commit e53d9d1394
19 changed files with 19 additions and 47 deletions
--- a/xCAT-server/share/xcat/install/fedora/service.fedora8.ppc64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/fedora/service.fedora8.ppc64.otherpkgs.pkglist
@@ -1,3 +1,2 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora8/ppc64/conserver
+xcat/xcat-dep/fedora8/ppc64/conserver-xcat
--- a/xCAT-server/share/xcat/install/fedora/service.fedora8.x86.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/fedora/service.fedora8.x86.otherpkgs.pkglist
@@ -1,3 +1,2 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora8/x86/conserver
+xcat/xcat-dep/fedora8/x86/conserver-xcat
--- a/xCAT-server/share/xcat/install/fedora/service.fedora8.x86_64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/fedora/service.fedora8.x86_64.otherpkgs.pkglist
@@ -1,3 +1,2 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora8/x86_64/conserver
+xcat/xcat-dep/fedora8/x86_64/conserver-xcat
--- a/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.otherpkgs.pkglist
@@ -1,3 +1,2 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora9/ppc64/conserver
+xcat/xcat-dep/fedora9/ppc64/conserver-xcat
--- a/xCAT-server/share/xcat/install/fedora/service.fedora9.x86_64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/fedora/service.fedora9.x86_64.otherpkgs.pkglist
@@ -1,3 +1,2 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora9/x86_64/conserver
+xcat/xcat-dep/fedora9/x86_64/conserver-xcat
--- a/xCAT-server/share/xcat/install/rh/service.rhels5.ppc64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.rhels5.ppc64.otherpkgs.pkglist
@@ -1,3 +1,2 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh5/ppc64/conserver
+xcat/xcat-dep/rh5/ppc64/conserver-xcat
--- a/xCAT-server/share/xcat/install/rh/service.rhels5.x86.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.rhels5.x86.otherpkgs.pkglist
@@ -1,3 +1,2 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh5/x86/conserver
+xcat/xcat-dep/rh5/x86/conserver-xcat
--- a/xCAT-server/share/xcat/install/rh/service.rhels5.x86_64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.rhels5.x86_64.otherpkgs.pkglist
@@ -1,3 +1,2 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh5/x86_64/conserver
+xcat/xcat-dep/rh5/x86_64/conserver-xcat
--- a/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.otherpkgs.pkglist
@@ -1,5 +1,4 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh6/ppc64/conserver
+xcat/xcat-dep/rh6/ppc64/conserver-xcat
 xcat/xcat-dep/rh6/ppc64/perl-Net-Telnet
 xcat/xcat-dep/rh6/ppc64/perl-Expect
--- a/xCAT-server/share/xcat/install/rh/service.rhels6.x86_64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.rhels6.x86_64.otherpkgs.pkglist
@@ -1,5 +1,4 @@
-OpenIPMI-tools
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh6/x86_64/conserver
+xcat/xcat-dep/rh6/x86_64/conserver-xcat
 xcat/xcat-dep/rh6/x86_64/perl-Net-Telnet
 xcat/xcat-dep/rh6/x86_64/perl-Expect
--- a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.ppc64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.ppc64.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora8/ppc64/conserver
+xcat/xcat-dep/fedora8/ppc64/conserver-xcat
--- a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora8/x86/conserver
+xcat/xcat-dep/fedora8/x86/conserver-xcat
--- a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86_64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86_64.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora8/x86_64/conserver
+xcat/xcat-dep/fedora8/x86_64/conserver-xcat
--- a/xCAT-server/share/xcat/netboot/fedora/service.fedora9.ppc64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora9.ppc64.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora9/ppc64/conserver
+xcat/xcat-dep/fedora9/ppc64/conserver-xcat
--- a/xCAT-server/share/xcat/netboot/fedora/service.fedora9.x86_64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora9.x86_64.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/fedora9/x86_64/conserver
+xcat/xcat-dep/fedora9/x86_64/conserver-xcat
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh5/ppc64/conserver
+xcat/xcat-dep/rh5/ppc64/conserver-xcat
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh5/x86/conserver
+xcat/xcat-dep/rh5/x86/conserver-xcat
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86_64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86_64.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh5/x86_64/conserver
+xcat/xcat-dep/rh5/x86_64/conserver-xcat
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.otherpkgs.pkglist
@@ -1,4 +1,2 @@
-OpenIPMI-tools
-tftp-server
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/rh6/ppc64/conserver
+xcat/xcat-dep/rh6/ppc64/conserver-xcat