From af998fbf2810ba5110f33f00d9e7c39106b82bab Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Mon, 9 Jul 2012 08:22:01 +0000 Subject: [PATCH] Additional code checkin for image group working with litefile and litetree tables git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13253 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/imgport.pm | 2 ++ xCAT-server/lib/xcat/plugins/litetree.pm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/imgport.pm b/xCAT-server/lib/xcat/plugins/imgport.pm index adbfc574d..b3dffe3db 100644 --- a/xCAT-server/lib/xcat/plugins/imgport.pm +++ b/xCAT-server/lib/xcat/plugins/imgport.pm @@ -611,6 +611,8 @@ sub make_bundle { my $osimagetab = xCAT::Table->new("osimage",-create=>1); my $imagegroups = $osimagetab->getAttribs({imagename => $imagename}, @imagegroupsattr); if ($imagegroups and $imagegroups->{groups}) { + # get the directories with no names + push @imageInfo, $lftab->getAttribs({image => ''}, ('file','options')); # get for the image groups specific directories push @imageInfo, $lftab->getAttribs({image => $imagegroups->{groups}}, ('file','options')); # get for the image specific directories diff --git a/xCAT-server/lib/xcat/plugins/litetree.pm b/xCAT-server/lib/xcat/plugins/litetree.pm index 6c7b7c60d..25d0430ec 100644 --- a/xCAT-server/lib/xcat/plugins/litetree.pm +++ b/xCAT-server/lib/xcat/plugins/litetree.pm @@ -326,6 +326,8 @@ sub getNodeData { my $osimagetab = xCAT::Table->new("osimage",-create=>1); my $imagegroups = $osimagetab->getAttribs({imagename => $image}, @imagegroupsattr); if ($imagegroups and $imagegroups->{groups}) { + # get the directories with no names + push @imageInfo, $tab->getAttribs({image => ''}, @attrs); # get for the image groups specific directories push @imageInfo, $tab->getAttribs({image => $imagegroups->{groups}}, @attrs); # get for the image specific directories