picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vol_id: add --offset option

Browse source
This commit is contained in:
Kay Sievers 2008-04-09 12:35:03 +02:00
parent 573bdd7e75
commit 8b5238670d
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extras/volume_id/lib/Makefile
View file

@ -13,7 +13,7 @@ INSTALL_DATA = ${INSTALL} -m 644
INSTALL_LIB = ${INSTALL} -m 755 INSTALL_LIB = ${INSTALL} -m 755
SHLIB_CUR = 0 SHLIB_CUR = 0
SHLIB_REV = 82 SHLIB_REV = 83
SHLIB_AGE = 0 SHLIB_AGE = 0
SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE) SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)

10
extras/volume_id/lib/volume_id.c
View file

@ -331,9 +331,9 @@ err:
} }
/* run only once into a timeout for unreadable devices */ /* 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 1;
return 0; return 0;
} }
@ -355,7 +355,7 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
if (id == NULL) if (id == NULL)
return -EINVAL; return -EINVAL;
if (!device_is_readable(id)) if (!device_is_readable(id, off))
return -1; return -1;
info("probing at offset 0x%llx, size 0x%llx", 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) if (id == NULL)
return -EINVAL; return -EINVAL;
if (!device_is_readable(id)) if (!device_is_readable(id, off))
return -1; return -1;
info("probing at offset 0x%llx, size 0x%llx", 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) if (id == NULL)
return -EINVAL; return -EINVAL;
if (!device_is_readable(id)) if (!device_is_readable(id, off))
return -1; return -1;
/* probe for raid first, because fs probes may be successful on raid members */ /* probe for raid first, because fs probes may be successful on raid members */

14
extras/volume_id/vol_id.c
View file

@ -134,6 +134,7 @@ int main(int argc, char *argv[])
{ "export", 0, NULL, 'x' }, { "export", 0, NULL, 'x' },
{ "skip-raid", 0, NULL, 's' }, { "skip-raid", 0, NULL, 's' },
{ "probe-all", 0, NULL, 'a' }, { "probe-all", 0, NULL, 'a' },
{ "offset", 1, NULL, 'o' },
{ "help", 0, NULL, 'h' }, { "help", 0, NULL, 'h' },
{} {}
}; };
@ -153,6 +154,7 @@ int main(int argc, char *argv[])
uint64_t size; uint64_t size;
int skip_raid = 0; int skip_raid = 0;
int probe_all = 0; int probe_all = 0;
uint64_t offset = 0;
const char *node; const char *node;
int fd; int fd;
const char *label, *uuid, *type, *type_version, *usage; const char *label, *uuid, *type, *type_version, *usage;
@ -167,7 +169,7 @@ int main(int argc, char *argv[])
while (1) { while (1) {
int option; int option;
option = getopt_long(argc, argv, "lLutxsah", options, NULL); option = getopt_long(argc, argv, "lLutxsaoh", options, NULL);
if (option == -1) if (option == -1)
break; break;
@ -193,6 +195,9 @@ int main(int argc, char *argv[])
case 'a': case 'a':
probe_all = 1; probe_all = 1;
break; break;
case 'o':
offset = strtoull(optarg, NULL, 0);
break;
case 'h': case 'h':
printf("Usage: vol_id [options] <device>\n" printf("Usage: vol_id [options] <device>\n"
" --export export key/value pairs\n" " --export export key/value pairs\n"
@ -202,6 +207,7 @@ int main(int argc, char *argv[])
" --uuid filesystem uuid\n" " --uuid filesystem uuid\n"
" --skip-raid don't probe for raid\n" " --skip-raid don't probe for raid\n"
" --probe-all find possibly conflicting signatures\n" " --probe-all find possibly conflicting signatures\n"
" --offset skip given number of bytes of input\n"
" --help\n\n"); " --help\n\n");
goto exit; goto exit;
default: default:
@ -249,14 +255,14 @@ int main(int argc, char *argv[])
} }
if (probe_all) { 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; goto exit;
} }
if (skip_raid) if (skip_raid)
retval = volume_id_probe_filesystem(vid, 0, size); retval = volume_id_probe_filesystem(vid, offset, size);
else else
retval = volume_id_probe_all(vid, 0, size); retval = volume_id_probe_all(vid, offset, size);
if (retval != 0) { if (retval != 0) {
fprintf(stderr, "%s: unknown volume type\n", node); fprintf(stderr, "%s: unknown volume type\n", node);
rc = 4; rc = 4;