diff options
| author |   jsing <jsing@openbsd.org> | 2011-11-13 14:07:17 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2011-11-13 14:07:17 +0000 |
| commit | 37c9e683591d8f61bfc0b8b130cafc67f51e4e9b (patch) | |
| tree | 4680c6f22a33f2b34a90a99a151eee64f2d9a7e5 | |
| parent | Cleanup rebuild initialisation code. In particular, reconstruct the chunk (diff) | |
| download | wireguard-openbsd-37c9e683591d8f61bfc0b8b130cafc67f51e4e9b.tar.xz wireguard-openbsd-37c9e683591d8f61bfc0b8b130cafc67f51e4e9b.zip | |
When initiating a rebuild update the DUID for the chunk so that
installboot has the correct details. Also zero the boot DUID list before
populating it in installboot, preventing the DUIDs of offline chunks from
remaining around.
| -rw-r--r-- | sys/dev/softraid.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index d9308455ba0..e0549dc4bf8 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.257 2011/11/13 13:57:43 jsing Exp $ */ +/* $OpenBSD: softraid.c,v 1.258 2011/11/13 14:07:17 jsing Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -2917,6 +2917,7 @@ sr_rebuild_init(struct sr_discipline *sd, dev_t dev, int hotspare) open = 0; /* leave dev open from here on out */ /* Fix up chunk. */ + bcopy(label.d_uid, chunk->src_duid, sizeof(chunk->src_duid)); chunk->src_dev_mm = dev; chunk->src_vn = vn; @@ -3434,6 +3435,7 @@ sr_ioctl_installboot(struct sr_softc *sc, struct bioc_installboot *bb) sbm = (struct sr_meta_boot *)omi->omi_som; bcopy(duid, sbm->sbm_root_duid, sizeof(sbm->sbm_root_duid)); + bzero(&sbm->sbm_boot_duid, sizeof(sbm->sbm_boot_duid)); sbm->sbm_bootblk_size = bbs; sbm->sbm_bootldr_size = bls; |