mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 21:05:08 +00:00
Remove whole-disk vdev support from zfsboot
This is consistent with the removal of whole-disk vdev support from libsa/zfs/zfs.c in r342151, and is part way to having the LBAs read during probe be fully constrained by partition tables when present. Reviewed by: tsoome MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D19142
This commit is contained in:
parent
07362361e0
commit
861729a32e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=344227
|
@ -545,32 +545,19 @@ probe_drive(struct zfsdsk *zdsk)
|
|||
char *sec;
|
||||
unsigned i;
|
||||
|
||||
/*
|
||||
* If we find a vdev on the whole disk, stop here.
|
||||
*/
|
||||
if (vdev_probe(vdev_read2, zdsk, NULL) == 0)
|
||||
return;
|
||||
|
||||
#ifdef LOADER_GELI_SUPPORT
|
||||
/*
|
||||
* Taste the disk, if it is GELI encrypted, decrypt it and check to see if
|
||||
* it is a usable vdev then. Otherwise dig
|
||||
* out the partition table and probe each slice/partition
|
||||
* in turn for a vdev or GELI encrypted vdev.
|
||||
* Taste the disk, if it is GELI encrypted, decrypt it then dig out the
|
||||
* partition table and probe each slice/partition in turn for a vdev or
|
||||
* GELI encrypted vdev.
|
||||
*/
|
||||
elba = drvsize_ext(zdsk);
|
||||
if (elba > 0) {
|
||||
elba--;
|
||||
}
|
||||
zdsk->gdev = geli_taste(vdev_read, zdsk, elba, "disk%u:0:");
|
||||
if (zdsk->gdev != NULL) {
|
||||
if (geli_havekey(zdsk->gdev) == 0 ||
|
||||
geli_passphrase(zdsk->gdev, gelipw) == 0) {
|
||||
if (vdev_probe(vdev_read2, zdsk, NULL) == 0) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((zdsk->gdev != NULL) && (geli_havekey(zdsk->gdev) == 0))
|
||||
geli_passphrase(zdsk->gdev, gelipw);
|
||||
#endif /* LOADER_GELI_SUPPORT */
|
||||
|
||||
sec = dmadat->secbuf;
|
||||
|
|
Loading…
Reference in a new issue