diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-04-05 02:09:17 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-04-05 02:09:17 +0000 |
| commit | 1b22e845260373d4103bf864380d71de1a71d201 (patch) | |
| tree | 7748699b90b2f539eb03748a992cdb877ca7d1a8 /sys/arch | |
| parent | fbf80b3b95d13cf96fbc23b917fafc9a9a329a92 (diff) | |
Be sure to preserve boot code load address and size information when
writing a new VID label.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/disksubr.c | 18 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/disksubr.c | 17 |
2 files changed, 31 insertions, 4 deletions
diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c index 7522567c5ed..16d1dd89813 100644 --- a/sys/arch/mvme68k/mvme68k/disksubr.c +++ b/sys/arch/mvme68k/mvme68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.66 2010/02/26 23:11:57 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.67 2010/04/05 02:09:15 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -108,6 +108,7 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp) bp = geteblk((int)lp->d_secsize); bp->b_dev = dev; + /* Read it in, slap the new label in, and write it back out */ bp->b_blkno = LABELSECTOR; bp->b_bcount = lp->d_secsize; bp->b_flags = B_BUSY | B_READ | B_RAW; @@ -134,8 +135,21 @@ bsdtocpulabel(struct disklabel *lp, struct mvmedisklabel *clp) { char *tmot = "MOTOROLA", *id = "M68K", *mot; int i; - + u_short osa_u, osa_l, osl; + u_int oss; + + /* preserve existing VID boot code information */ + osa_u = clp->vid_osa_u; + osa_l = clp->vid_osa_l; + osl = clp->vid_osl; + oss = clp->vid_oss; bzero(clp, sizeof(*clp)); + clp->vid_osa_u = osa_u; + clp->vid_osa_l = osa_l; + clp->vid_osl = osl; + clp->vid_oss = oss; + clp->vid_cas = clp->vid_cal = 1; + clp->magic1 = lp->d_magic; clp->type = lp->d_type; clp->subtype = lp->d_subtype; diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c index 27883520286..6d4eea636f2 100644 --- a/sys/arch/mvme88k/mvme88k/disksubr.c +++ b/sys/arch/mvme88k/mvme88k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.62 2010/02/26 23:11:57 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.63 2010/04/05 02:09:16 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -135,8 +135,21 @@ bsdtocpulabel(struct disklabel *lp, struct mvmedisklabel *clp) { char *tmot = "MOTOROLA", *id = "M88K", *mot; int i; - + u_short osa_u, osa_l, osl; + u_int oss; + + /* preserve existing VID boot code information */ + osa_u = clp->vid_osa_u; + osa_l = clp->vid_osa_l; + osl = clp->vid_osl; + oss = clp->vid_oss; bzero(clp, sizeof(*clp)); + clp->vid_osa_u = osa_u; + clp->vid_osa_l = osa_l; + clp->vid_osl = osl; + clp->vid_oss = oss; + clp->vid_cas = clp->vid_cal = 1; + clp->magic1 = lp->d_magic; clp->type = lp->d_type; clp->subtype = lp->d_subtype; |