From 835831666b1280dadbce254531e4741da85a4be6 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 22 Apr 2011 17:47:51 +0000 Subject: [PATCH] -Correct two last little mistakes in previous checkins git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9384 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/esx.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm index 0738320d4..6934d2507 100644 --- a/xCAT-server/lib/xcat/plugins/esx.pm +++ b/xCAT-server/lib/xcat/plugins/esx.pm @@ -4129,10 +4129,12 @@ sub cpNetbootImages { } #now that we have a list, do the copy (mostly redundant, but PXE needs them tftp accessible) foreach (@filestocopy) { + chomp; + s/ *\z//; my $mod = scalar fileparse($_); if (-r "$overridedir/$mod") { copyIfNewer("$overridedir/$mod","$destDir/$mod") or xCAT::SvrUtils::sendmsg([1,"Could not copy netboot contents from $overridedir/$mod to $destDir/$mod, $!"], $output_handler); - } elsif (-r "$_") { + } elsif (-r "$srcDir/$mod") { copyIfNewer($srcDir."/".$mod,"$destDir/$mod") or xCAT::SvrUtils::sendmsg([1,"Could not copy netboot contents from $srcDir/$mod to $destDir/$mod, $!"], $output_handler); } elsif ($mod ne "xcatmod.tgz") { xCAT::SvrUtils::sendmsg([1,"Could not copy netboot contents from $srcDir/$mod to $destDir/$mod, $srcDir/$mod not found"], $output_handler);