From 3a928b23b7512b2e5dc277bc41a33ab5df14a851 Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 21 Oct 2010 08:02:24 +0000
Subject: [PATCH]     for defect 3090498, remove two unused variable in
 sles.pm;     for defect 3091772 and 3091775, two errors in sles genimage.

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

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 5e0007649..003d251a3 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -265,10 +265,8 @@ sub mknetboot
         }
 
         # TODO: move the table operations out of the foreach loop
-        my $restab = xCAT::Table->new('noderes');
         my $bptab  = xCAT::Table->new('bootparams',-create=>1);
         my $hmtab  = xCAT::Table->new('nodehm');
-        $ent    = $restab->getNodeAttribs($node, ['primarynic', 'installnic']);
         my $sent   =
           $hmtab->getNodeAttribs($node,
                                  ['serialport', 'serialspeed', 'serialflow']);
diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index 92662fc39..4fd491987 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -592,7 +592,7 @@ if ($needUpdateTable) {
         $updates_os{'provmethod'} = 'netboot';
         $updates_os{'osname'} = 'Linux';
         $updates_os{'osvers'} = $osver;
-        $updates_os{'osdistro'} = 'rh'; # not used currently
+        $updates_os{'osdistro'} = 'sles'; # not used currently
         $updates_os{'osarch'} = $arch;
 
         $osimagetab->setAttribs(\%keyhash, \%updates_os);
@@ -607,6 +607,8 @@ if ($needUpdateTable) {
         $updates_os{'provmethod'} = 'statelite';
 
         $osimagetab->setAttribs(\%keyhash, \%updates_os);
+        $osimagetab->commit;
+
         $linuximagetab->setAttribs(\%keyhash, \%updates);
         $linuximagetab->commit;
     }