From 16d4e7de4a4f277e146252e96bdae10479da5537 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Fri, 13 May 2016 02:54:10 -0400
Subject: [PATCH] fix issue 1084: [FVT] 2.12 mknb failed on ubuntu 16.04 x86
 env

---
 xCAT-server/lib/xcat/plugins/mknb.pm | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm
index 0449d136c..565872b12 100644
--- a/xCAT-server/lib/xcat/plugins/mknb.pm
+++ b/xCAT-server/lib/xcat/plugins/mknb.pm
@@ -198,17 +198,13 @@ CREAT_CONF_FILE:
       chmod(0755,"$tftpdir/xcat/xnba/nets");
       mkpath("$tftpdir/pxelinux.cfg");
       chmod(0755,"$tftpdir/pxelinux.cfg");
-      if (! -r "$tftpdir/pxelinux.0") {
-         unless (-r "/usr/lib/syslinux/pxelinux.0" or -r "/usr/share/syslinux/pxelinux.0") {
-            $callback->({error=>["Unable to find pxelinux.0 "],errorcode=>[1]});
-            return;
-         }
-         if (-r "/usr/lib/syslinux/pxelinux.0") {
-            copy("/usr/lib/syslinux/pxelinux.0","$tftpdir/pxelinux.0");
-         } else {
-            copy("/usr/share/syslinux/pxelinux.0","$tftpdir/pxelinux.0");
-         }
-         chmod(0644,"$tftpdir/pxelinux.0");
+      if (-r "/usr/lib/syslinux/pxelinux.0") {
+          copy("/usr/lib/syslinux/pxelinux.0","$tftpdir/pxelinux.0");
+      } elsif (-r "/usr/share/syslinux/pxelinux.0") {
+          copy("/usr/share/syslinux/pxelinux.0","$tftpdir/pxelinux.0");
+      }
+      if (-r "$tftpdir/pxelinux.0") {
+          chmod(0644,"$tftpdir/pxelinux.0");
       }
    } elsif ($arch =~ /ppc/) {
       mkpath("$tftpdir/pxelinux.cfg/p/");