From 4175e33d5c20324b7e357ac91e24b0f8a89e63d7 Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 22 Mar 2011 08:36:11 +0000
Subject: [PATCH] Merge branch 'imgcapture'

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9125 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/imgcapture.pm        | 15 ---------------
 .../xcat/netboot/rh/compute.imgcapture.exlist     | 12 ++++++------
 .../xcat/netboot/sles/compute.imgcapture.exlist   | 12 ++++++------
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/imgcapture.pm b/xCAT-server/lib/xcat/plugins/imgcapture.pm
index fdd048bf2..07de6a5d0 100644
--- a/xCAT-server/lib/xcat/plugins/imgcapture.pm
+++ b/xCAT-server/lib/xcat/plugins/imgcapture.pm
@@ -317,21 +317,6 @@ sub imgcapture {
         xCAT::MsgUtils->message("D", $rsp, $callback);
     }
 
-    my @spotslist = ("/tmp/", "/proc/", "/sys/", "/dev/");
-
-    if($verbose) {
-        my $rsp = {};
-        $rsp->{data}->[0] = qq{The spots to be restored in the image are:};
-        foreach (@spotslist) {
-            push @{$rsp->{data}}, $_;
-        }
-        xCAT::MsgUtils->message("D", $rsp, $callback);
-    }
-    # create the directories listed in @spotslist in the rootimg
-    foreach my $path (@spotslist) {
-        mkpath("$rootimgdir$path");
-    }   
-
     # the next step is to call "genimage"
     my $platform = getplatform($os);
     if( -e "$::XCATROOT/share/xcat/netboot/$platform/genimage" ) {
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.imgcapture.exlist b/xCAT-server/share/xcat/netboot/rh/compute.imgcapture.exlist
index bba98b33c..43e5845c9 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.imgcapture.exlist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.imgcapture.exlist
@@ -1,6 +1,6 @@
-./tmp*
-./proc*
-./dev*
-./sys*
-./install*
-./xcatpost*
+./tmp/*
+./proc/*
+./dev/*
+./sys/*
+./install/*
+./xcatpost/*
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.imgcapture.exlist b/xCAT-server/share/xcat/netboot/sles/compute.imgcapture.exlist
index bba98b33c..43e5845c9 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.imgcapture.exlist
+++ b/xCAT-server/share/xcat/netboot/sles/compute.imgcapture.exlist
@@ -1,6 +1,6 @@
-./tmp*
-./proc*
-./dev*
-./sys*
-./install*
-./xcatpost*
+./tmp/*
+./proc/*
+./dev/*
+./sys/*
+./install/*
+./xcatpost/*