diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2013-11-29 15:27:14 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2013-11-29 15:27:14 +0000 |
| commit | 3a7310e0d3524fe07264e7eb068dda13fb5a150d (patch) | |
| tree | 18bbe5041ce45d501b01e31adde8c97f6652f00a /app-admin/conky/files | |
| parent | Rails 3.1 is removed, remove its mask. (diff) | |
| download | historical-3a7310e0d3524fe07264e7eb068dda13fb5a150d.tar.gz historical-3a7310e0d3524fe07264e7eb068dda13fb5a150d.tar.bz2 historical-3a7310e0d3524fe07264e7eb068dda13fb5a150d.zip | |
Fix byte counting on dmcrypt devices. Thanks to Stefan Huber for the patch.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D
Diffstat (limited to 'app-admin/conky/files')
| -rw-r--r-- | app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch b/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch new file mode 100644 index 000000000000..38ace86f2048 --- /dev/null +++ b/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch @@ -0,0 +1,28 @@ +diff --git a/src/.linux.c.swp b/src/.linux.c.swp +index 909d454..f6fc388 100644 +Binary files a/src/.linux.c.swp and b/src/.linux.c.swp differ +diff --git a/src/linux.c b/src/linux.c +index ce5f733..bbf8dc5 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -80,6 +80,10 @@ + #define NBD_MAJOR 43 + #endif + ++#if !defined(DM_MAJOR) ++#define DM_MAJOR 253 ++#endif ++ + #ifdef HAVE_IWLIB + #include <iwlib.h> + #endif +@@ -2336,7 +2340,8 @@ int update_diskio(void) + * + * XXX: ignore devices which are part of a SW RAID (MD_MAJOR) */ + if (col_count == 5 && major != LVM_BLK_MAJOR && major != NBD_MAJOR +- && major != RAMDISK_MAJOR && major != LOOP_MAJOR) { ++ && major != RAMDISK_MAJOR && major != LOOP_MAJOR ++ && major != DM_MAJOR ) { + /* check needed for kernel >= 2.6.31, see sf #2942117 */ + if (is_disk(devbuf)) { + total_reads += reads; |