diff options
| -rw-r--r-- | extras/volume_id/lib/Makefile | 2 | ||||
| -rw-r--r-- | extras/volume_id/lib/volume_id.c | 10 | ||||
| -rw-r--r-- | extras/volume_id/vol_id.c | 14 |
3 files changed, 16 insertions, 10 deletions
diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile index c0905f4a06..0e1565f98a 100644 --- a/extras/volume_id/lib/Makefile +++ b/extras/volume_id/lib/Makefile @@ -13,7 +13,7 @@ INSTALL_DATA = ${INSTALL} -m 644 INSTALL_LIB = ${INSTALL} -m 755 SHLIB_CUR = 0 -SHLIB_REV = 82 +SHLIB_REV = 83 SHLIB_AGE = 0 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE) diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c index e8f6de35fd..7c68fb1ef9 100644 --- a/extras/volume_id/lib/volume_id.c +++ b/extras/volume_id/lib/volume_id.c @@ -331,9 +331,9 @@ err: } /* run only once into a timeout for unreadable devices */ -static int device_is_readable(struct volume_id *id) +static int device_is_readable(struct volume_id *id, uint64_t off) { - if (volume_id_get_buffer(id, 0x00, 0x200) != NULL) + if (volume_id_get_buffer(id, off, 0x200) != NULL) return 1; return 0; } @@ -355,7 +355,7 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size) if (id == NULL) return -EINVAL; - if (!device_is_readable(id)) + if (!device_is_readable(id, off)) return -1; info("probing at offset 0x%llx, size 0x%llx", @@ -389,7 +389,7 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size if (id == NULL) return -EINVAL; - if (!device_is_readable(id)) + if (!device_is_readable(id, off)) return -1; info("probing at offset 0x%llx, size 0x%llx", @@ -421,7 +421,7 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) if (id == NULL) return -EINVAL; - if (!device_is_readable(id)) + if (!device_is_readable(id, off)) return -1; /* probe for raid first, because fs probes may be successful on raid members */ diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index 38950ee85f..04e85abb7f 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -134,6 +134,7 @@ int main(int argc, char *argv[]) { "export", 0, NULL, 'x' }, { "skip-raid", 0, NULL, 's' }, { "probe-all", 0, NULL, 'a' }, + { "offset", 1, NULL, 'o' }, { "help", 0, NULL, 'h' }, {} }; @@ -153,6 +154,7 @@ int main(int argc, char *argv[]) uint64_t size; int skip_raid = 0; int probe_all = 0; + uint64_t offset = 0; const char *node; int fd; const char *label, *uuid, *type, *type_version, *usage; @@ -167,7 +169,7 @@ int main(int argc, char *argv[]) while (1) { int option; - option = getopt_long(argc, argv, "lLutxsah", options, NULL); + option = getopt_long(argc, argv, "lLutxsaoh", options, NULL); if (option == -1) break; @@ -193,6 +195,9 @@ int main(int argc, char *argv[]) case 'a': probe_all = 1; break; + case 'o': + offset = strtoull(optarg, NULL, 0); + break; case 'h': printf("Usage: vol_id [options] <device>\n" " --export export key/value pairs\n" @@ -202,6 +207,7 @@ int main(int argc, char *argv[]) " --uuid filesystem uuid\n" " --skip-raid don't probe for raid\n" " --probe-all find possibly conflicting signatures\n" + " --offset skip given number of bytes of input\n" " --help\n\n"); goto exit; default: @@ -249,14 +255,14 @@ int main(int argc, char *argv[]) } if (probe_all) { - volume_id_all_probers(all_probers, vid, 0, size, NULL); + volume_id_all_probers(all_probers, vid, offset, size, NULL); goto exit; } if (skip_raid) - retval = volume_id_probe_filesystem(vid, 0, size); + retval = volume_id_probe_filesystem(vid, offset, size); else - retval = volume_id_probe_all(vid, 0, size); + retval = volume_id_probe_all(vid, offset, size); if (retval != 0) { fprintf(stderr, "%s: unknown volume type\n", node); rc = 4; |