From c54950d239338f0e65b1432d938b41399a757c3b Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Fri, 21 Oct 2011 09:36:53 +0000 Subject: Fix 1.43 to not bzero the in-core disklabel but really the UniOS disklabel as intended in disklabel_bsd_to_om(); repairs vnd operation. Found the hard way by aoyama@. --- sys/arch/luna88k/luna88k/disksubr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c index ac6b1960436..57d3b766520 100644 --- a/sys/arch/luna88k/luna88k/disksubr.c +++ b/sys/arch/luna88k/luna88k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.50 2011/04/16 03:21:15 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.51 2011/10/21 09:36:52 miod Exp $ */ /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */ /* @@ -330,7 +330,7 @@ disklabel_bsd_to_om(struct disklabel *lp, struct sun_disklabel *sl) return (EINVAL); /* Format conversion. */ - bzero(lp, sizeof(*lp)); + bzero(sl, sizeof(*sl)); memcpy(sl->sl_text, lp->d_packname, sizeof(lp->d_packname)); sl->sl_rpm = 0; /* UniOS */ #if 0 /* leave as was */ -- cgit v1.2.3