From 520ec4ab909f37e6d532820eede0e0ee42dd8a22 Mon Sep 17 00:00:00 2001
From: James Nylen <jnylen@gmail.com>
Date: Tue, 24 Apr 2018 22:58:31 -0500
Subject: [PATCH 1/2] Ignore files generated by checkinstall

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 087ade2..f30380d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
 *~
+*.deb
 *.gmo
 *.la
 *.lo
 *.o
 *.swp
 *.tar.*
+*.tgz
 .deps
 .libs
 ChangeLog
@@ -26,6 +28,8 @@ common/about-data.c
 common/binary-data.c
 common/color-scheme-icons.inc
 data/generate-about-data.sh
+description-pak
+doc-pak
 extras/pacman/*.PKGBUILD
 indicator/multiload-ng-indicator
 indicator/*.desktop

From adc0d5ec53b4a8bc16da1234eff708db72b007a8 Mon Sep 17 00:00:00 2001
From: James Nylen <jnylen@gmail.com>
Date: Tue, 24 Apr 2018 23:18:05 -0500
Subject: [PATCH 2/2] Fix sysfs path detection for /dev/nvme* and /dev/dm-*

---
 common/graph-data.h |  2 ++
 common/graph-disk.c | 57 ++++++++++++++++++++++++++++++---------------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/common/graph-data.h b/common/graph-data.h
index fcf3082..c5320a6 100644
--- a/common/graph-data.h
+++ b/common/graph-data.h
@@ -157,6 +157,8 @@ multiload_graph_load_cmdline_output (LoadGraph *g, LoadData *xd);
 G_GNUC_INTERNAL void
 multiload_graph_load_tooltip_update (char *buf_title, size_t len_title, char *buf_text, size_t len_text, LoadGraph *g, LoadData *xd, gint style);
 
+G_GNUC_INTERNAL gboolean
+multiload_graph_disk_device_is_partition (char *device, char *prefix, size_t sizeof_prefix);
 G_GNUC_INTERNAL MultiloadFilter *
 multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd);
 G_GNUC_INTERNAL void
diff --git a/common/graph-disk.c b/common/graph-disk.c
index 9a7405a..885971b 100644
--- a/common/graph-disk.c
+++ b/common/graph-disk.c
@@ -35,6 +35,42 @@
 
 static const char *fstype_ignore_list[] = { "rootfs", "smbfs", "nfs", "cifs", "fuse.", NULL };
 
+gboolean
+multiload_graph_disk_device_is_partition (char *device, char *prefix, size_t sizeof_prefix) {
+	gboolean is_partition = FALSE;
+	guint i;
+	g_strlcpy(prefix, device, sizeof_prefix);
+
+	if (strncmp (prefix, "nvme", 4) == 0) {
+		// several possibilities:
+		// - nvme0
+		// - nvme0n1
+		// - nvme0n1p1
+		// only the last one is a partition, with sysfs subfolder nvme0n1
+		for (i=4; prefix[i] != '\0'; i++) {
+			if (isdigit(prefix[i]) && prefix[i-1] == 'p') {
+				prefix[i-1] = '\0';
+				is_partition = TRUE;
+				break;
+			}
+		}
+		return is_partition;
+	}
+
+	if (strncmp (prefix, "dm-", 3) == 0) {
+		// device-mapper devices do not show up in a sysfs subfolder
+		return FALSE;
+	}
+
+	for (i=0; prefix[i] != '\0'; i++) {
+		if (isdigit(prefix[i])) {
+			prefix[i] = '\0';
+			is_partition = TRUE;
+			break;
+		}
+	}
+	return is_partition;
+}
 
 MultiloadFilter *
 multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd)
@@ -44,7 +80,6 @@ multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd)
 
 	guint64 blocks;
 	char device[20], prefix[20], label[30];
-	guint i;
 
 	MultiloadFilter *filter = multiload_filter_new();
 
@@ -55,15 +90,7 @@ multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd)
 			continue;
 
 		// extract block device and partition names
-		gboolean is_partition = FALSE;
-		g_strlcpy(prefix, device, sizeof(prefix));
-		for (i=0; prefix[i] != '\0'; i++) {
-			if (isdigit(prefix[i])) {
-				prefix[i] = '\0';
-				is_partition = TRUE;
-				break;
-			}
-		}
+		gboolean is_partition = multiload_graph_disk_device_is_partition(device, prefix, sizeof(prefix));
 
 		// generate sysfs path
 		char sysfs_path[PATH_MAX];
@@ -133,16 +160,8 @@ multiload_graph_disk_get_data (int Maximum, int data [2], LoadGraph *g, DiskData
 			continue;
 
 		// extract block device and partition names
-		gboolean is_partition = FALSE;
 		device = &mnt->mnt_fsname[5];
-		g_strlcpy(prefix, device, sizeof(prefix));
-		for (i=0; prefix[i] != '\0'; i++) {
-			if (isdigit(prefix[i])) {
-				prefix[i] = '\0';
-				is_partition = TRUE;
-				break;
-			}
-		}
+		gboolean is_partition = multiload_graph_disk_device_is_partition(device, prefix, sizeof(prefix));
 
 		// filter
 		if (g->config->filter_enable) {