diff options
| author | jkh <jkh@FreeBSD.org> | 1996-01-14 11:45:05 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-01-14 11:45:05 +0000 |
| commit | 073adf1991096a635729fce1cb45e08dfe072811 (patch) | |
| tree | a5eb361e3f8c9cb46d54c932037f28a74503a96f /release | |
| parent | 158fdfef06d5aeef67ca79424bcba719c4fc9cdc (diff) | |
| download | FreeBSD-src-073adf1991096a635729fce1cb45e08dfe072811.zip FreeBSD-src-073adf1991096a635729fce1cb45e08dfe072811.tar.gz | |
Don't try to swap to a disk that isn't selected.
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/install.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 462bda0..db17d91 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.72 1995/09/18 16:52:27 peter Exp $ + * $Id: install.c,v 1.73 1995/12/07 10:33:52 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -115,6 +115,8 @@ checkLabels(Chunk **rdev, Chunk **sdev, Chunk **udev) swapdev = NULL; /* Now check for swap devices */ for (i = 0; devs[i]; i++) { + if (!devs[i]->enabled) + continue; disk = (Disk *)devs[i]->private; msgDebug("Scanning disk %s for swap partitions\n", disk->name); if (!disk->chunks) |
