aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/sade/install.c
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1996-01-14 11:45:05 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1996-01-14 11:45:05 +0000
commit3c3bc06e1c65ac2b2c1a5fa4030c5ca6ad95f9f5 (patch)
treea5eb361e3f8c9cb46d54c932037f28a74503a96f /usr.sbin/sade/install.c
parent0de2e98fc262ac1fc422768bdff97894383bf9c6 (diff)
downloadsrc-3c3bc06e1c65ac2b2c1a5fa4030c5ca6ad95f9f5.tar.gz
src-3c3bc06e1c65ac2b2c1a5fa4030c5ca6ad95f9f5.zip
Don't try to swap to a disk that isn't selected.
Notes
Notes: svn path=/head/; revision=13421
Diffstat (limited to 'usr.sbin/sade/install.c')
-rw-r--r--usr.sbin/sade/install.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 462bda08992b..db17d914a40a 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/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)