diff options
| author | Kay Sievers <kay.sievers@suse.de> | 2006-07-13 16:59:01 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@suse.de> | 2006-07-13 16:59:01 +0200 |
| commit | 7d5ccc081008a08f066b5bb6805f417585ae663a (patch) | |
| tree | 6c8e11bfaefeae57c4d6ac46b76d16b0cf5fa685 /extras/volume_id/lib | |
| parent | f566b05b572492e4e7a684a5b04231412d71d0bd (diff) | |
vol_id: add --skip-raid and --probe-all option
Diffstat (limited to 'extras/volume_id/lib')
| -rw-r--r-- | extras/volume_id/lib/Makefile | 2 | ||||
| -rw-r--r-- | extras/volume_id/lib/exported_symbols | 4 | ||||
| -rw-r--r-- | extras/volume_id/lib/volume_id.c | 12 |
3 files changed, 11 insertions, 7 deletions
diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile index 90cd63e745..66b3b92f9d 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 = 66 +SHLIB_REV = 67 SHLIB_AGE = 0 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE) diff --git a/extras/volume_id/lib/exported_symbols b/extras/volume_id/lib/exported_symbols index 3f10ec0c78..57a1feb3dc 100644 --- a/extras/volume_id/lib/exported_symbols +++ b/extras/volume_id/lib/exported_symbols @@ -7,6 +7,8 @@ volume_id_probe_raid; volume_id_close; + volume_id_probe_linux_swap; + volume_id_probe_luks; volume_id_probe_cramfs; volume_id_probe_ext; volume_id_probe_vfat; @@ -41,6 +43,8 @@ volume_id_probe_promise_fasttrack_raid; volume_id_probe_silicon_medley_raid; volume_id_probe_via_raid; + volume_id_probe_adaptec_raid; + volume_id_probe_jmicron_raid; local: *; }; diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c index bcdbe2feaa..f74319fb96 100644 --- a/extras/volume_id/lib/volume_id.c +++ b/extras/volume_id/lib/volume_id.c @@ -102,21 +102,21 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size 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; - if (volume_id_probe_vfat(id, off) == 0) goto found; - if (volume_id_probe_xfs(id, off) == 0) - goto found; - /* fill buffer with maximum */ volume_id_get_buffer(id, 0, SB_BUFFER_SIZE); if (volume_id_probe_linux_swap(id, off) == 0) goto found; + if (volume_id_probe_luks(id, off) == 0) + goto found; + + if (volume_id_probe_xfs(id, off) == 0) + goto found; + if (volume_id_probe_ext(id, off) == 0) goto found; |