From f143dae32f2bf375aac29e00877249effa4eb2ae Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 4 Oct 2010 16:12:34 +0000
Subject: [PATCH] Added network drivers for s390x. Change nodeset command for
 zVM to handle the new name of initrd-statelite.gz.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7743 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/zvm.pm          | 12 ++++++------
 xCAT-server/share/xcat/netboot/rh/genimage   |  3 ++-
 xCAT-server/share/xcat/netboot/sles/genimage |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index 596829d44..d840423fa 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -3391,8 +3391,8 @@ sub nodeSet {
 		# Netboot directory
 		my $netbootDir = "$installDir/netboot/$os/$arch/$profile";
 		my $kernelFile = "$netbootDir/kernel";
-		my $parmFile   = "$netbootDir/parm";
-		my $initFile   = "$netbootDir/initrd.gz";
+		my $parmFile   = "$netbootDir/parm-statelite";
+		my $initFile   = "$netbootDir/initrd-statelite.gz";
 
 		# If parmfile exists
 		if ( -e $parmFile ) {
@@ -3461,8 +3461,8 @@ sub nodeSet {
 
 		# Temporary kernel, parmfile, and initrd
 		my $tmpKernelFile = "/tmp/$os-kernel";
-		my $tmpParmFile   = "/tmp/$os-parm";
-		my $tmpInitFile   = "/tmp/$os-initrd.gz";
+		my $tmpParmFile   = "/tmp/$os-parm-statelite";
+		my $tmpInitFile   = "/tmp/$os-initrd-statelite.gz";
 
 		if (`ssh -o ConnectTimeout=5 $hcp "ls /tmp" | grep "$os-kernel"`) {
 
@@ -3474,7 +3474,7 @@ sub nodeSet {
 			xCAT::zvmUtils->sendFile( $hcp, $kernelFile, $tmpKernelFile );
 		}
 
-		if (`ssh -o ConnectTimeout=5 $hcp "ls /tmp" | grep "$os-parm"`) {
+		if (`ssh -o ConnectTimeout=5 $hcp "ls /tmp" | grep "$os-parm-statelite"`) {
 
 			# Do nothing
 		}
@@ -3484,7 +3484,7 @@ sub nodeSet {
 			xCAT::zvmUtils->sendFile( $hcp, $parmFile, $tmpParmFile );
 		}
 
-		if (`ssh -o ConnectTimeout=5 $hcp "ls /tmp" | grep "$os-initrd.gz"`) {
+		if (`ssh -o ConnectTimeout=5 $hcp "ls /tmp" | grep "$os-initrd-statelite.gz"`) {
 
 			# Do nothing
 		}
diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index ff4e50780..c88b887fe 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -265,8 +265,9 @@ if ($netdriver) {
         @ndrivers = qw/tg3 bnx2 bnx2x e1000 e1000e igb mlx_en/;
     } elsif ($arch eq 'ppc64') {
         @ndrivers = qw/e1000 e1000e igb ibmveth ehea/;
+    } elsif ($arch eq 's390x') {   
+    	@ndrivers = qw/qdio ccwgroup/;
     }
-    # TODO: need to set the default network drivers for s390x ?
 }
 foreach (split /,/,$netdriver) {
    unless (/\.ko$/) {
diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index 88de76666..92662fc39 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -261,7 +261,7 @@ if ($netdriver) {
     } elsif ($arch eq 'ppc64') {
         @ndrivers = qw/e1000 e1000e igb ibmveth ehea/;
     } elsif ($arch eq "s390x") {
-        # TODO: put the default network drviers for s390x here
+        @ndrivers = qw/qdio ccwgroup qeth qeth_l2 qeth_l3/;
     }
 }