vol_id: add NetWare volume detection

[elogind.git] / extras / volume_id / lib / volume_id.c

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index 4662b210dc37b789ea5afbc7bc35248747d73284..472ea246112117a4fd3ebcf70b548ad4fcb5abca 100644 (file)
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -21,7 +21,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -35,13 +34,16 @@ static void default_log(int priority, const char *file, int line, const char *fo
        return;
 }
 
-volume_id_log_fn volume_id_log = default_log;
+volume_id_log_fn_t volume_id_log_fn = default_log;
 
 int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
        if (id == NULL)
                return -EINVAL;
 
+       info("probing at offset 0x%llx, size 0x%llx",
+           (unsigned long long) off, (unsigned long long) size);
+
        /* probe for raid first, because fs probes may be successful on raid members */
        if (size) {
                if (volume_id_probe_linux_raid(id, off, size) == 0)
@@ -91,6 +93,9 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
        if (id == NULL)
                return -EINVAL;
 
+       info("probing at offset 0x%llx, size 0x%llx",
+           (unsigned long long) off, (unsigned long long) size);
+
        if (volume_id_probe_luks(id, off) == 0)
                goto found;
 
@@ -158,6 +163,9 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
        if (volume_id_probe_squashfs(id, off) == 0)
                goto found;
 
+       if (volume_id_probe_netware(id, off) == 0)
+               goto found;
+
        return -1;
 
 found: