diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2009-12-20 17:55:08 -0200 | 
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2009-12-20 17:55:08 -0200 | 
| commit | babf60d57c79d0e85255dad6401b4962fa217cb9 (patch) | |
| tree | 1ad285ef11b7e8c56b1800159208b550c9e4b711 /hardinfo2 | |
| parent | 1cd93bcccb8cedc4f5cd355b69f88512c1e2880a (diff) | |
Apply patches from bug #10. Contributor unknown.
Diffstat (limited to 'hardinfo2')
| -rw-r--r-- | hardinfo2/arch/linux/common/net.h | 5 | ||||
| -rw-r--r-- | hardinfo2/arch/linux/common/os.h | 8 | 
2 files changed, 12 insertions, 1 deletions
| diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h index 5ec56d6a..c3224321 100644 --- a/hardinfo2/arch/linux/common/net.h +++ b/hardinfo2/arch/linux/common/net.h @@ -245,6 +245,11 @@ static struct {      { "bnep", "Bluetooth", "bluetooth" },      { "br", "Bridge Interface", "network" },      { "ham", "Hamachi Virtual Personal Network", "network"}, +    { "net", "Ethernet", "network-interface" }, +    { "ifb", "Intermediate Functional Block", "network" }, +    { "gre", "GRE Network Tunnel", "network" }, +    { "msh", "Mesh Network", "wireless" }, +    { "wmaster", "Wireless Master Interface", "wireless" },      { NULL, "Unknown", "network" },  }; diff --git a/hardinfo2/arch/linux/common/os.h b/hardinfo2/arch/linux/common/os.h index 5de27d82..23d4a7af 100644 --- a/hardinfo2/arch/linux/common/os.h +++ b/hardinfo2/arch/linux/common/os.h @@ -21,7 +21,13 @@ get_libc_version(void)  {      FILE *libc;      gchar buf[256], *tmp, *p; -     + +    if (g_file_test("/lib/ld-uClibc.so.0", G_FILE_TEST_EXISTS)) { +      return g_strdup("uClibc Library"); +    } else if (!g_file_test("/lib/libc.so.6", G_FILE_TEST_EXISTS)) { +      goto err; +    } +         libc = popen("/lib/libc.so.6", "r");      if (!libc) goto err; | 
