From 33c6e7b5d2e32c79915b868ca8ff90a6b493177b Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Sat, 15 May 2010 01:32:13 +0000 Subject: [PATCH] -Fix syntax error in esx plugin -Suppress warning in Common.pm library git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6132 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Common.pm | 3 ++- xCAT-server/lib/xcat/plugins/esx.pm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/xCAT/Common.pm b/perl-xCAT/xCAT/Common.pm index 0d2e42fb2..6131878c9 100644 --- a/perl-xCAT/xCAT/Common.pm +++ b/perl-xCAT/xCAT/Common.pm @@ -6,6 +6,7 @@ package xCAT::Common; use File::stat; use File::Copy; +use Thread qw/yield/; BEGIN { @@ -42,7 +43,7 @@ sub forward_data { close($rfh); } } - yield; #Try to avoid useless iterations as much as possible + yield(); #Try to avoid useless iterations as much as possible return $rc; } diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm index 2f91ea743..528fba832 100644 --- a/xCAT-server/lib/xcat/plugins/esx.pm +++ b/xCAT-server/lib/xcat/plugins/esx.pm @@ -2277,7 +2277,7 @@ sub makecustomizedmod { close($shadow); if (-e "$::XCATROOT/share/xcat/netboot/esxi/47.xcat-networking") { mkpath($tempdir."/etc/vmware/init/init.d"); - copy( "$::XCATROOT/share/xcat/netboot/esxi/47.xcat-networking",$tempdir."/etc/vmware/init/init.d/47.xcat-networking" + copy( "$::XCATROOT/share/xcat/netboot/esxi/47.xcat-networking",$tempdir."/etc/vmware/init/init.d/47.xcat-networking"); } #TODO: auto-enable ssh and request boot-time customization rather than on-demand? require Cwd;