[gnome-boxes] unattended-installer: Avoid setting a letter as target dev



commit c740e7673cf89ae17a905ec40abb56329a693095
Author: Fabiano FidĂȘncio <fidencio redhat com>
Date:   Tue Jun 11 10:15:25 2019 +0200

    unattended-installer: Avoid setting a letter as target dev
    
    Libvirt has absolutely no knowledge about mapping letters to devices. By
    setting a letter to a target dev Libvirt would raise a "Unknown disk
    name '%s' and no address specified" error, failing then the
    installation.
    
    Signed-off-by: Fabiano FidĂȘncio <fidencio redhat com>

 src/unattended-installer.vala | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index 49dd56d4..69638504 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -366,7 +366,7 @@ public override async bool prepare (ActivityProgress progress = new ActivityProg
         return yield setup_drivers (progress, cancellable);
     }
 
-    private DomainDisk? get_unattended_disk_config (PathFormat path_format = PathFormat.UNIX) {
+    private DomainDisk? get_unattended_disk_config () {
         var disk = new DomainDisk ();
         disk.set_type (DomainDiskType.FILE);
         disk.set_driver_name ("qemu");
@@ -374,15 +374,11 @@ public override async bool prepare (ActivityProgress progress = new ActivityProg
         disk.set_source (disk_file.get_path ());
 
         if (injection_method == InstallScriptInjectionMethod.FLOPPY) {
-            disk.set_target_dev ((path_format == PathFormat.DOS)? "A" : "fda");
+            disk.set_target_dev ("fda");
             disk.set_guest_device_type (DomainDiskGuestDeviceType.FLOPPY);
             disk.set_target_bus (DomainDiskBus.FDC);
         } else {
-            // Path format checks below are most probably practically redundant but a small price for future 
safety
-            if (supports_virtio_disk || supports_virtio1_disk)
-                disk.set_target_dev ((path_format == PathFormat.UNIX)? "sda" : "E");
-            else
-                disk.set_target_dev ((path_format == PathFormat.UNIX)? "sdb" : "E");
+            disk.set_target_dev ((supports_virtio_disk || supports_virtio1_disk)? "sda":  "sdb");
             disk.set_guest_device_type (DomainDiskGuestDeviceType.DISK);
             disk.set_target_bus (DomainDiskBus.USB);
         }


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