TestSupport.pm: introduce iso_gen_flags_basic

... 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>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 1b90d17cd20a7cb5ca4b96e58f09e9cb11a05b83..82d3baac01e49a01183e11f13c94c477a9f7271f 100644 (file)
--- 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 88fec62b72cdc887ab84ab9eb40959fcb60b7c9d..01e3615ea2d242df0d41318270ca68ddd7e22da5 100755 (executable)
--- 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',