From 1f52436da532947c786176cb3ba4730cc29b2075 Mon Sep 17 00:00:00 2001 From: immarvin Date: Wed, 4 Jan 2012 07:45:15 +0000 Subject: [PATCH] the file discinfo.pm is moved into xCAT::data namespace,anaconda.pm is modified accordingly git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11330 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index dd623f315..5604d42d2 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -1183,7 +1183,8 @@ sub copycd my $installroot = "/install"; my $sitetab = xCAT::Table->new('site'); - require xCAT::discinfo; + require xCAT::data::discinfo; + if ($sitetab) { @@ -1239,11 +1240,11 @@ sub copycd $darch = "x86"; } close($dinfo); - if ($xCAT::discinfo::distnames{$did}) + if ($xCAT::data::discinfo::distnames{$did}) { unless ($distname) { - $distname = $xCAT::discinfo::distnames{$did}; + $distname = $xCAT::data::discinfo::distnames{$did}; } } elsif ($desc =~ /^Final$/)