From 0052950159f61b0fad4c57610bc95a697f033dec Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Sat, 14 Mar 2009 16:00:35 +0000 Subject: [PATCH] -Move more modules to load on demand git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2902 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 2 +- xCAT-server/lib/xcat/plugins/blade.pm | 2 +- xCAT-server/lib/xcat/plugins/boottarget.pm | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 81be4ac41..db8c64bd2 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -12,7 +12,6 @@ use POSIX qw(WNOHANG nice); use xCAT::Table; use xCAT::Utils; use xCAT::MsgUtils; -use xCAT::Yum; use xCAT::Template; #use xCAT::Postage; use Data::Dumper; @@ -823,6 +822,7 @@ sub copycd #my $rc = system("cd $path; find . | nice -n 20 cpio -dump $installroot/$distname/$arch"); #my $rc = system("cd $path;rsync -a . $installroot/$distname/$arch/"); chmod 0755, "$installroot/$distname/$arch"; + require xCAT::Yum; xCAT::Yum->localize_yumrepo($installroot, $distname, $arch); if ($rc != 0) { diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm index 9c40894bd..8ef8de321 100644 --- a/xCAT-server/lib/xcat/plugins/blade.pm +++ b/xCAT-server/lib/xcat/plugins/blade.pm @@ -32,7 +32,6 @@ use Storable qw(freeze thaw); use IO::Select; use IO::Handle; use Time::HiRes qw(gettimeofday sleep); -use Net::Telnet; use xCAT::DBobjUtils; use Getopt::Long; @@ -2249,6 +2248,7 @@ sub telnetcmds { unless (%handled) { return([0,\@unhandled]); } + require Net::Telnet; my $t = new Net::Telnet( Timeout=>15, Errmode=>'return', diff --git a/xCAT-server/lib/xcat/plugins/boottarget.pm b/xCAT-server/lib/xcat/plugins/boottarget.pm index 6552a05b8..338b466ce 100644 --- a/xCAT-server/lib/xcat/plugins/boottarget.pm +++ b/xCAT-server/lib/xcat/plugins/boottarget.pm @@ -12,7 +12,6 @@ use POSIX qw(WNOHANG nice); use xCAT::Table; use xCAT::Utils; use xCAT::MsgUtils; -use xCAT::Yum; use xCAT::Template; #use xCAT::Postage; use Data::Dumper;