From a0493a0ff181b950c94e6475ccb6aed512a770e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= Date: Wed, 3 Aug 2005 13:26:06 +0000 Subject: [PATCH] Fixed for people running 2.6 without /sys. * netload.c: (glibtop_get_netload_s): Fixed for people running 2.6 without /sys. --- sysdeps/linux/ChangeLog | 6 ++++++ sysdeps/linux/netload.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sysdeps/linux/ChangeLog b/sysdeps/linux/ChangeLog index b9281a3f..aabdded4 100644 --- a/sysdeps/linux/ChangeLog +++ b/sysdeps/linux/ChangeLog @@ -1,3 +1,9 @@ +2005-08-03 Benoît Dejean + + * netload.c: (glibtop_get_netload_s): + + Fixed for people running 2.6 without /sys. + 2005-08-02 Benoît Dejean * glibtop_server.h: diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c index 2203d024..44bd8e6f 100644 --- a/sysdeps/linux/netload.c +++ b/sysdeps/linux/netload.c @@ -540,10 +540,12 @@ glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, if (server->os_version_code < LINUX_VERSION_CODE(2, 1, 14)) { linux_2_0_stats(server, buf, interface); } - else if (server->os_version_code > LINUX_VERSION_CODE(2, 6, 0)) { + else if (server->os_version_code > LINUX_VERSION_CODE(2, 6, 0) + && g_file_test("/sys", G_FILE_TEST_IS_DIR)) { linux_2_6_stats(server, buf, interface); } - else if (server->os_version_code > LINUX_VERSION_CODE(2, 4, 0)) { + else { + /* 2.4 and 2.6 without /sys (?$£Z¥!) */ linux_2_4_stats(server, buf, interface); }