From 3c3bc06e1c65ac2b2c1a5fa4030c5ca6ad95f9f5 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Sun, 14 Jan 1996 11:45:05 +0000
Subject: [PATCH] Don't try to swap to a disk that isn't selected.

---
 release/sysinstall/install.c  | 4 +++-
 usr.sbin/sade/install.c       | 4 +++-
 usr.sbin/sysinstall/install.c | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 462bda08992..db17d914a40 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)
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 462bda08992..db17d914a40 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)
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 462bda08992..db17d914a40 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/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)