From d3b2c73a2301065933dc407890e0641f21e05d0f Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 17 Sep 2010 18:12:25 +0000
Subject: [PATCH] bug fix

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

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 07e555113..779d48524 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -178,13 +178,13 @@ if (@ARGV > 0 and $needUpdateTable eq 1) {
     } else {
         $kernelver = $ref_linuximage_tab->{'kernelver'};
     }
-    if ($ndrivers) {
-        if ($ndrivers ne $ref_linuximage_tab->{'netdrivers'}) {
+    if ($netdriver) {
+        if ($netdriver ne $ref_linuximage_tab->{'netdrivers'}) {
             print "The netdrivers are different from the value in linuximage table, will update it\n";
-            $updates{'netdrivers'} = $ndrivers;
+            $updates{'netdrivers'} = $netdriver;
         }
     } else {
-        $ndrivers =  $ref_linuximage_tab->{'netdrivers'};
+        $netdriver =  $ref_linuximage_tab->{'netdrivers'};
     }
     if ($permission) {
         if ($permission ne $ref_linuximage_tab->{'permission'}) {
diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index ec050cbdc..5923bb1e5 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -198,13 +198,13 @@ if (@ARGV > 0 and $needUpdateTable eq 1) {
         $kernelver = $ref_linuximage_tab->{'kernelver'};
     }
 
-    if ($ndrivers) {
-        if ($ndrivers ne $ref_linuximage_tab->{'netdrivers'}) {
+    if ($netdriver) {
+        if ($netdriver ne $ref_linuximage_tab->{'netdrivers'}) {
             print "The netdrivers are different from the value in linuximage table, will update it\n";
-            $updates{'netdrivers'} = $ndrivers;
+            $updates{'netdrivers'} = $netdriver;
         }
     } else {
-        $ndrivers = $ref_linuximage_tab->{'netdrivers'};
+        $netdriver = $ref_linuximage_tab->{'netdrivers'};
     }
     
     if ($permission) {
@@ -238,8 +238,7 @@ $updates{'rootimgdir'} = $destdir if ($needUpdateTable);
 
 $rootimg_dir="$destdir/rootimg";
 
-
-unless ($osver and $profile and $netdriver and $prinic) {
+unless ($osver and $profile) {
    print 'Usage: genimage -i <nodebootif> -n <nodenetdrivers> [-r <otherifaces>] -k <KERNELVER> -o <OSVER> -p <PROFILE> [-a <ARCH>] [-l rootlimitsize] [-t tmplimitsize] [--permission <permission>]'."\n";
    print '       genimage [-i <nodebootif>] [-n <nodenetdrivers>] [-r <otherifaces>] [-k <KERNELVER>] [-o <OSVER>] [-p <PROFILE>] [-a <ARCH>] [-l rootlimitsize] [-t tmplimitsize] [--permission <permission>]  <imagename>'."\n";
    print "       --permission is used for statelite only\n";