diff options
| author | Graham Inggs <ginggs@debian.org> | 2018-02-17 19:10:56 +0200 |
|---|---|---|
| committer | Graham Inggs <ginggs@debian.org> | 2018-02-17 19:10:56 +0200 |
| commit | 11f2c5337f5fc504f1676551943986aa5384f0e4 (patch) | |
| tree | 6bab07cabbfc9b8447fd3473d6966aed235b4c11 | |
| parent | 1ee982cd8317522e4b8f19b68318bf6b39fc3ffe (diff) | |
| download | debian_htop-11f2c5337f5fc504f1676551943986aa5384f0e4.tar.gz debian_htop-11f2c5337f5fc504f1676551943986aa5384f0e4.tar.bz2 debian_htop-11f2c5337f5fc504f1676551943986aa5384f0e4.zip | |
Refresh debian/patches/601-openvz-new-ctid-vpid.patch
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/601-openvz-new-ctid-vpid.patch | 17 |
2 files changed, 2 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index e437644..b39ee85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ htop (2.1.0-3) UNRELEASED; urgency=medium * Fix case of dyscalculia in changelog entry for 2.1.0-1 * Update Daniel Lange's email address * Add debian/clean to remove autogenerated headers + * Refresh debian/patches/601-openvz-new-ctid-vpid.patch -- Graham Inggs <ginggs@debian.org> Mon, 05 Feb 2018 18:07:57 +0000 diff --git a/debian/patches/601-openvz-new-ctid-vpid.patch b/debian/patches/601-openvz-new-ctid-vpid.patch index c5997e2..40ffbd2 100644 --- a/debian/patches/601-openvz-new-ctid-vpid.patch +++ b/debian/patches/601-openvz-new-ctid-vpid.patch @@ -11,11 +11,7 @@ CTIDs and VPIDs are now read from /proc/[id]/status instead of /proc/[id]/stat b * OpenVZ kernel appends own data to /proc/[id]/stat file, a change in parameters reported by vanilla kernel would also shift the position of OpenVZ data so it would not be read correctly. As UUIDs are much longer than old numerical CTIDs, the UUID strings will get truncated in output (although sorting is still done using complete UUIDs). ---- - linux/LinuxProcess.c | 9 ++++++--- - linux/LinuxProcess.h | 2 +- - linux/LinuxProcessList.c | 38 +++++++++++++++++++++++--------------- - 3 files changed, 30 insertions(+), 19 deletions(-) + --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -119,7 +119,7 @@ @@ -55,17 +51,6 @@ As UUIDs are much longer than old numerical CTIDs, the UUID strings will get tru case VPID: return (p2->vpid - p1->vpid); #endif ---- a/linux/LinuxProcess.h -+++ b/linux/LinuxProcess.h -@@ -111,7 +111,7 @@ - double io_rate_write_bps; - #endif - #ifdef HAVE_OPENVZ -- unsigned int ctid; -+ char* ctid; - unsigned int vpid; - #endif - #ifdef HAVE_VSERVER --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -480,27 +480,35 @@ |