From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH v5 09/13] TestSupport.pm: introduce
	iso_copy_content_from_image
Date: Wed, 2 Apr 2014 20:29:42 +0100
Message-ID: <1396466986-21198-10-git-send-email-wei.liu2@citrix.com>
References: <1396466986-21198-1-git-send-email-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1396466986-21198-1-git-send-email-wei.liu2@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>, ian.jackson@eu.citrix.com, ian.campbell@citrix.com
List-Id: xen-devel@lists.xenproject.org

... which returns a string of commands to pass into target_cmd_root.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm |   14 ++++++++++++++
 ts-redhat-install      |   10 +---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 82d3baa..b74422b 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -104,6 +104,7 @@ BEGIN {
                       iso_create_xorriso
                       iso_create_empty
                       iso_gen_flags_basic
+                      iso_copy_content_from_image
                       guest_editconfig_nocd
                       );
     %EXPORT_TAGS = ( );
@@ -1929,6 +1930,19 @@ sub iso_gen_flags_basic() {
               -boot-info-table);
 }
 
+sub iso_copy_content_from_image($$) {
+    my ($gho,$newiso) = @_;
+    return <<"END";
+            set -ex
+            umount /mnt ||:
+            rm -rf $newiso
+            mount -o loop -r $gho->{Rimage} /mnt
+            mkdir $newiso
+            cp -a /mnt/. $newiso/.
+            umount /mnt
+END
+}
+
 sub guest_editconfig_nocd ($$) {
     my ($gho,$emptyiso) = @_;
     guest_editconfig($gho->{Host}, $gho, sub {
diff --git a/ts-redhat-install b/ts-redhat-install
index 01e3615..924abac 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -130,15 +130,7 @@ sub prep () {
     more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
                           OnReboot => 'preserve',
                           PostImageHook => sub {
-        target_cmd_root($ho, <<END, $isotimeout);
-            set -ex
-            umount /mnt ||:
-            rm -rf $newiso
-            mount -o loop -r $gho->{Rimage} /mnt
-            mkdir $newiso
-            cp -a /mnt/. $newiso/.
-            umount /mnt
-END
+        target_cmd_root($ho, copy_iso_content_to_dir($gho,$newiso), $isotimeout);
         target_editfile_root($ho, "$newiso/isolinux/isolinux.cfg", sub {
             while (<EI>) {
                 if (m/^\s+append/) {
-- 
1.7.10.4