diff options
| author | Ondrej Čerman <ondrej.cerman@gmail.com> | 2019-01-12 18:07:09 +0100 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-01-15 10:21:13 -0800 |
| commit | 1eb28cdf81fda7bc748e2ba071e2d222a3287453 (patch) | |
| tree | fba7d308e7b59e96f09c8c0b8ee4d629d7e91b75 /modules/devices.c | |
| parent | 340d04ee59683ecadfe4b6d19f65d1f497e17e11 (diff) | |
devices/storage: Use udisks2 as primary source for storage info
Diffstat (limited to 'modules/devices.c')
| -rw-r--r-- | modules/devices.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/devices.c b/modules/devices.c index fa474180..1c3253e4 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -38,6 +38,7 @@ #include "devices.h" #include "dt_util.h" +#include "udisks2_util.h" gchar *callback_processors(); gchar *callback_gpu(); @@ -616,8 +617,10 @@ void scan_storage(gboolean reload) g_free(storage_list); storage_list = g_strdup(""); - __scan_ide_devices(); - __scan_scsi_devices(); + if (!__scan_udisks2_devices()) { + __scan_ide_devices(); + __scan_scsi_devices(); + } SCAN_END(); } @@ -791,14 +794,14 @@ void hi_module_init(void) init_memory_labels(); init_cups(); sensors_init(); - storage_init(); + udisks2_init(); } void hi_module_deinit(void) { moreinfo_del_with_prefix("DEV"); sensors_shutdown(); - storage_shutdown(); + udisks2_shutdown(); g_hash_table_destroy(memlabels); g_module_close(cups); } |