From 5b937d60ee72cd167bd3bfef56d8a763350aabb1 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Tue, 14 Oct 1997 14:41:17 +0000
Subject: [PATCH] Fix bogon I introduced while adding disks menu to label
 editor.

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

diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 7136e1f7af4a..0b21179497d1 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $
+ * $Id: label.c,v 1.78 1997/10/13 11:33:27 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -130,11 +130,13 @@ diskLabelEditor(dialogMenuItem *self)
 	return DITEM_FAILURE;
     }
     else if (cnt) {
+	int i;
+
 	/* Some are already selected */
 	if (variable_get(VAR_NONINTERACTIVE))
-	    i |= diskLabelNonInteractive(devs[0]);
+	    i |= diskLabelNonInteractive(NULL);
 	else
-	    i |= diskLabel(devs[0]);
+	    i |= diskLabel(NULL);
     }
     else {
 	/* No disks are selected, fall-back case now */
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 7136e1f7af4a..0b21179497d1 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $
+ * $Id: label.c,v 1.78 1997/10/13 11:33:27 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -130,11 +130,13 @@ diskLabelEditor(dialogMenuItem *self)
 	return DITEM_FAILURE;
     }
     else if (cnt) {
+	int i;
+
 	/* Some are already selected */
 	if (variable_get(VAR_NONINTERACTIVE))
-	    i |= diskLabelNonInteractive(devs[0]);
+	    i |= diskLabelNonInteractive(NULL);
 	else
-	    i |= diskLabel(devs[0]);
+	    i |= diskLabel(NULL);
     }
     else {
 	/* No disks are selected, fall-back case now */
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 7136e1f7af4a..0b21179497d1 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $
+ * $Id: label.c,v 1.78 1997/10/13 11:33:27 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -130,11 +130,13 @@ diskLabelEditor(dialogMenuItem *self)
 	return DITEM_FAILURE;
     }
     else if (cnt) {
+	int i;
+
 	/* Some are already selected */
 	if (variable_get(VAR_NONINTERACTIVE))
-	    i |= diskLabelNonInteractive(devs[0]);
+	    i |= diskLabelNonInteractive(NULL);
 	else
-	    i |= diskLabel(devs[0]);
+	    i |= diskLabel(NULL);
     }
     else {
 	/* No disks are selected, fall-back case now */