[gnome-boxes] unattended-installer: Use genisoimage instead of mkisofs



commit 25f946634f88925e289586d5ae054cf3c17021ba
Author: Fabiano FidĂȘncio <fidencio redhat com>
Date:   Tue Jun 11 08:31:38 2019 +0200

    unattended-installer: Use genisoimage instead of mkisofs
    
    On Fedora mkisofs and genisoimage are identical and shipped in the same
    package. On debian only genisoimage is shipped due to some historical
    weirdness or licensing dispute or something. So just prefer the
    genisoimage naming.
    
    This commit is a c&p from virt-manager's c9af3f94ce commit, implemented
    by Cole Robinson.
    
    Signed-off-by: Fabiano FidĂȘncio <fidencio redhat com>

 src/unattended-installer.vala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index d02dabcc..e2ac20f4 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -99,7 +99,7 @@
         }
     }
 
-    private static string escape_mkisofs_path (string path) {
+    private static string escape_genisoimage_path (string path) {
         var str = path.replace ("\\", "\\\\");
 
         return str.replace ("=", "\\=");
@@ -209,10 +209,10 @@ public override async void prepare_for_installation (string vm_name, Cancellable
                 var secondary_disk_path = secondary_disk_file.get_path ();
 
                 debug ("Creating secondary disk image '%s'...", secondary_disk_path);
-                string[] argv = { "mkisofs", "-graft-points", "-J", "-rock", "-o", secondary_disk_path };
+                string[] argv = { "genisoimage", "-graft-points", "-J", "-rock", "-o", secondary_disk_path };
                 foreach (var unattended_file in secondary_unattended_files) {
-                    var dest_path = escape_mkisofs_path (unattended_file.dest_name);
-                    var src_path = escape_mkisofs_path (unattended_file.src_path);
+                    var dest_path = escape_genisoimage_path (unattended_file.dest_name);
+                    var src_path = escape_genisoimage_path (unattended_file.src_path);
 
                     argv += dest_path + "=" + src_path;
                 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]