]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
installer: Show name of block device in disk listing
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 4 Sep 2014 08:59:16 +0000 (10:59 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 4 Sep 2014 08:59:16 +0000 (10:59 +0200)
src/installer/hw.c

index a3e5e59ba6bda296aef757a723544788748170ed..3ec4d75e0e87f3666b81d6ccb63c2d6bdb6a670b 100644 (file)
@@ -219,6 +219,7 @@ struct hw_disk** hw_find_disks(struct hw* hw, const char* sourcedrive) {
                disk->ref = 1;
 
                strncpy(disk->path, dev_path, sizeof(disk->path));
+               const char* p = disk->path + 5;
 
                disk->size = size;
 
@@ -252,15 +253,15 @@ struct hw_disk** hw_find_disks(struct hw* hw, const char* sourcedrive) {
 
                if (*disk->vendor && *disk->model) {
                        snprintf(disk->description, sizeof(disk->description),
-                               "%s - %s - %s", size_str, disk->vendor, disk->model);
+                               "%s - %s - %s - %s", size_str, p, disk->vendor, disk->model);
 
                } else if (*disk->vendor || *disk->model) {
                        snprintf(disk->description, sizeof(disk->description),
-                               "%s - %s", size_str, (*disk->vendor) ? disk->vendor : disk->model);
+                               "%s - %s - %s", size_str, p, (*disk->vendor) ? disk->vendor : disk->model);
 
                } else {
                        snprintf(disk->description, sizeof(disk->description),
-                               "%s - N/A", size_str);
+                               "%s - %s", size_str, p);
                }
 
                *disks++ = disk;