diff options
| author |   jsing <jsing@openbsd.org> | 2010-04-23 15:25:20 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2010-04-23 15:25:20 +0000 |
| commit | d8b1e0ec2dbc403b285d5ef241509edd31fbdde8 (patch) | |
| tree | 04bb028f5c45627307a0309e695988420803b660 /sys/kern/subr_disk.c | |
| parent | When converting A-Z into a control character, want to subtract 64 not (diff) | |
| download | wireguard-openbsd-d8b1e0ec2dbc403b285d5ef241509edd31fbdde8.tar.xz wireguard-openbsd-d8b1e0ec2dbc403b285d5ef241509edd31fbdde8.zip | |
Recycle unused disklabel fields in order to create a disklabel unique
identifier, allowing the disk to be identified without relying on the
device name.
ok deraadt@ krw@ beck@ marco@ todd@
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 659a401c795..53638585e6c 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.99 2010/01/14 23:12:11 schwarze Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.100 2010/04/23 15:25:21 jsing Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -278,13 +278,10 @@ checkdisklabel(void *rlp, struct disklabel *lp, dlp->d_secpercyl = swap32(dlp->d_secpercyl); dlp->d_secperunit = swap32(dlp->d_secperunit); - dlp->d_sparespertrack = swap16(dlp->d_sparespertrack); - dlp->d_sparespercyl = swap16(dlp->d_sparespercyl); + dlp->d_label_uid = swap64(dlp->d_label_uid); dlp->d_acylinders = swap32(dlp->d_acylinders); - dlp->d_rpm = swap16(dlp->d_rpm); - dlp->d_interleave = swap16(dlp->d_interleave); dlp->d_flags = swap32(dlp->d_flags); for (i = 0; i < NDDATA; i++) |