From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 4 Sep 2014 08:59:16 +0000 (+0200)
Subject: installer: Show name of block device in disk listing
X-Git-Tag: v2.17-core87~103^2~51^2~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c8b2d994e5756f104f015302dde782596f4d2b5;p=ipfire-2.x.git

installer: Show name of block device in disk listing
---

diff --git a/src/installer/hw.c b/src/installer/hw.c
index a3e5e59ba6..3ec4d75e0e 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -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;