From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH v5 08/13] TestSupport.pm: introduce
	iso_gen_flags_basic
Date: Wed, 2 Apr 2014 20:29:41 +0100
Message-ID: <1396466986-21198-9-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 the flags that can be passed to xorriso to create a
bootable image (not EFI capable though).

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

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 1b90d17..82d3baa 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -103,6 +103,7 @@ BEGIN {
 
                       iso_create_xorriso
                       iso_create_empty
+                      iso_gen_flags_basic
                       guest_editconfig_nocd
                       );
     %EXPORT_TAGS = ( );
@@ -1919,6 +1920,15 @@ sub iso_create_empty($$$) {
     iso_create_xorriso($ho, $emptyiso, $emptydir, 60, @isogen_opts);
 }
 
+sub iso_gen_flags_basic() {
+    return qw(-as mkisofs -R -J
+              -b isolinux/isolinux.bin
+              -c isolinux/boot.cat
+              -no-emul-boot
+              -boot-load-size 4
+              -boot-info-table);
+}
+
 sub guest_editconfig_nocd ($$) {
     my ($gho,$emptyiso) = @_;
     guest_editconfig($gho->{Host}, $gho, sub {
diff --git a/ts-redhat-install b/ts-redhat-install
index 88fec62..01e3615 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -125,12 +125,7 @@ sub prep () {
 
     iso_create_empty($ho, $emptyiso, $emptydir);
 
-    my @isogen= qw(-as mkisofs -R -J
-                   -b isolinux/isolinux.bin
-                   -c isolinux/boot.cat
-                   -no-emul-boot
-                   -boot-load-size 4
-                   -boot-info-table);
+    my @isogen= iso_gen_flags_basic();
 
     more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
                           OnReboot => 'preserve',
-- 
1.7.10.4