From 3b08c74368d524a63b48ae7aeb35ea605d58e288 Mon Sep 17 00:00:00 2001
From: xq2005 <xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 14 Dec 2012 05:43:03 +0000
Subject: [PATCH] nfsserver attribute is not the required field for nodes on
 ubuntu

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14647 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/debian.pm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 0aff7d759..046a6d8f8 100644
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -411,7 +411,7 @@ sub mkinstall
     my %osents = %{$ostab->getNodesAttribs(\@nodes, ['profile', 'os', 'arch', 'provmethod'])};
     my %rents =
               %{$restab->getNodesAttribs(\@nodes,
-                                     ['nfsserver', 'primarynic', 'installnic'])};
+                                     ['xcatmaster', 'nfsserver', 'primarynic', 'installnic'])};
     my %hents = 
               %{$hmtab->getNodesAttribs(\@nodes,
                                      ['serialport', 'serialspeed', 'serialflow'])};
@@ -674,11 +674,17 @@ sub mkinstall
 #                                      'serialport', 'serialspeed', 'serialflow'
 #                                     ]
 #                                     );
-            unless ($ent and $ent->{nfsserver})
+            my $instserver;
+            if ($ent and $ent->{xcatmaster}){
+                $instserver = $ent->{xcatmaster};
+            }
+            else{
+                $instserver = '!myipfn!';
+            }
+
+            if ($ent and $ent->{nfsserver})
             {
-                $callback->({error => ["No noderes.nfsserver defined for " . $node],
-                             errorcode => [1]});
-                next;
+                $instserver = $ent->{nfsserver};
             }
 	        #if ($platform eq "ubuntu"){
             #    my $kcmdline =
@@ -689,7 +695,7 @@ sub mkinstall
             #} else 
 	    #{
             my $kcmdline = "nofb utf8 auto url=http://"
-                  . $ent->{nfsserver}
+                  . $instserver
                   . "$installroot/autoinst/"
                   . $node;
 	    #}