From 4760c03321199ba1d7e5b4ad3326d87de31d6570 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 10 Aug 2011 08:12:57 +0000
Subject: [PATCH] Fixed bug 3373496  that imgimport created two levels of
 rootimg

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10258 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/imgport.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/imgport.pm b/xCAT-server/lib/xcat/plugins/imgport.pm
index 3807b812e..428f66f14 100644
--- a/xCAT-server/lib/xcat/plugins/imgport.pm
+++ b/xCAT-server/lib/xcat/plugins/imgport.pm
@@ -590,7 +590,7 @@ sub make_bundle {
 	if ($rootimgdir) {
 	    $callback->({data=>["Packing root image. It will take a while"]});
 	    system("cd $rootimgdir; find rootimg |cpio -H newc -o | gzip -c - > $tpath/rootimgtree.gz");
-	    $attribs->{'rootimgtree'} = "$rootimgdir/rootimg/rootimgtree.gz";
+	    $attribs->{'rootimgtree'} = "$rootimgdir/rootimgtree.gz";
 	} else {
 	    $callback->({error=>["Couldn't locate the root image directory. "],errorcode=>[1]});
 	    return 0;
@@ -744,7 +744,6 @@ sub extract_bundle {
     # go through each image directory.  Find the XML and put it into the array.  If there are any 
     # errors then the whole thing is over and we error and leave.
     foreach my $imgdir (@files){
-	#print "$imgdir \n";
 	unless(-r "$imgdir/manifest.xml"){
 	    $callback->({error=>["Failed to find manifest.xml file in image bundle"],errorcode=>[1]});
 	    return;