From f023330458c4706f34db962473c58d1e2f7b6fb4 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 24 Aug 2009 20:41:24 +0000
Subject: [PATCH] -Fix problem where XCATROOT ending in non-slash resulted in
 problems with recent checkins

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

diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm
index 74c4938e5..5f0f13961 100644
--- a/xCAT-server/lib/xcat/plugins/pxe.pm
+++ b/xCAT-server/lib/xcat/plugins/pxe.pm
@@ -404,11 +404,11 @@ sub process_request {
 
   #back to normal business
   if (! -r "$tftpdir/xcat/pxelinux.0") {
-    unless (-r $::XCATROOT."share/xcat/netboot/syslinux/pxelinux.0") {
-       $callback->({error=>["Unable to find pxelinux.0 at ".$::XCATROOT."share/xcat/netboot/syslinux/pxelinux.0"],errorcode=>[1]});
+    unless (-r $::XCATROOT."/share/xcat/netboot/syslinux/pxelinux.0") {
+       $callback->({error=>["Unable to find pxelinux.0 at ".$::XCATROOT."/share/xcat/netboot/syslinux/pxelinux.0"],errorcode=>[1]});
        return;
     }
-    copy($::XCATROOT."share/xcat/netboot/syslinux/pxelinux.0","$tftpdir/xcat/pxelinux.0");
+    copy($::XCATROOT."/share/xcat/netboot/syslinux/pxelinux.0","$tftpdir/xcat/pxelinux.0");
      chmod(0644,"$tftpdir/pxelinux.0");
   }
   unless ( -r "$tftpdir/xcat/pxelinux.0" ) {