chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: minix version 3 support
[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 50eb72dbd5da6995136ca084684a4401df00cb26..c6c8d5af6d837810777e31a4df38ae82170ca8da 100644
(file)
--- a/
extras/volume_id/lib/volume_id.c
+++ b/
extras/volume_id/lib/volume_id.c
@@
-69,15
+69,21
@@
int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
if (volume_id_probe_highpoint_45x_raid(id, off, size) == 0)
goto found;
if (volume_id_probe_highpoint_45x_raid(id, off, size) == 0)
goto found;
+
+ if (volume_id_probe_adaptec_raid(id, off, size) == 0)
+ goto found;
+
+ if (volume_id_probe_jmicron_raid(id, off, size) == 0)
+ goto found;
}
}
- if (volume_id_probe_lvm1(id, off) == 0)
+ if (volume_id_probe_lvm1(id, off
, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_lvm2(id, off) == 0)
+ if (volume_id_probe_lvm2(id, off
, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_highpoint_37x_raid(id, off) == 0)
+ if (volume_id_probe_highpoint_37x_raid(id, off
, size
) == 0)
goto found;
return -1;
goto found;
return -1;
@@
-96,73
+102,79
@@
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);
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)
+ if (volume_id_probe_vfat(id, off, size) == 0)
+ goto found;
+
+ /* fill buffer with maximum */
+ volume_id_get_buffer(id, 0, SB_BUFFER_SIZE);
+
+ if (volume_id_probe_linux_swap(id, off, size) == 0)
goto found;
goto found;
- if (volume_id_probe_
vfat(id, off
) == 0)
+ if (volume_id_probe_
luks(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_xfs(id, off) == 0)
+ if (volume_id_probe_xfs(id, off
, size
) == 0)
goto found;
goto found;
- /* fill buffer with maximum */
-
volume_id_get_buffer(id, 0, SB_BUFFER_SIZE)
;
+ if (volume_id_probe_ext(id, off, size) == 0)
+
goto found
;
- if (volume_id_probe_
linux_swap(id, off
) == 0)
+ if (volume_id_probe_
reiserfs(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
ext(id, off
) == 0)
+ if (volume_id_probe_
jfs(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
reiserfs(id, off
) == 0)
+ if (volume_id_probe_
udf(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
jfs(id, off
) == 0)
+ if (volume_id_probe_
iso9660(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
udf(id, off
) == 0)
+ if (volume_id_probe_
hfs_hfsplus(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
iso9660(id, off
) == 0)
+ if (volume_id_probe_
ufs(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
hfs_hfsplus(id, off)
== 0)
+ if (volume_id_probe_
ntfs(id, off, size)
== 0)
goto found;
goto found;
- if (volume_id_probe_
ufs(id, off
) == 0)
+ if (volume_id_probe_
cramfs(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
ntfs(id, off)
== 0)
+ if (volume_id_probe_
romfs(id, off, size)
== 0)
goto found;
goto found;
- if (volume_id_probe_
cramfs(id, off
) == 0)
+ if (volume_id_probe_
hpfs(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
romfs(id, off
) == 0)
+ if (volume_id_probe_
sysv(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
hpfs(id, off
) == 0)
+ if (volume_id_probe_
minix(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
sysv(id, off
) == 0)
+ if (volume_id_probe_
ocfs1(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
minix(id, off
) == 0)
+ if (volume_id_probe_
ocfs2(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
ocfs1(id, off
) == 0)
+ if (volume_id_probe_
vxfs(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
ocfs2(id, off
) == 0)
+ if (volume_id_probe_
squashfs(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
vxfs(id, off
) == 0)
+ if (volume_id_probe_
netware(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
squashfs(id, off
) == 0)
+ if (volume_id_probe_
gfs(id, off, size
) == 0)
goto found;
goto found;
- if (volume_id_probe_
netware(id, off
) == 0)
+ if (volume_id_probe_
gfs2(id, off, size
) == 0)
goto found;
return -1;
goto found;
return -1;