diff options
| author | jkh <jkh@FreeBSD.org> | 1997-10-14 14:41:17 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-10-14 14:41:17 +0000 |
| commit | 98e4a60d1d7ea61814f43798ac34eba47b6c8ff6 (patch) | |
| tree | ceb146a669b6e553227b17720c6169ea994ccbb5 | |
| parent | 2b4a6ad696344abca796fc9d22083c9aab0f2834 (diff) | |
| download | FreeBSD-src-98e4a60d1d7ea61814f43798ac34eba47b6c8ff6.zip FreeBSD-src-98e4a60d1d7ea61814f43798ac34eba47b6c8ff6.tar.gz | |
Fix bogon I introduced while adding disks menu to label editor.
| -rw-r--r-- | release/sysinstall/label.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sade/label.c | 8 | ||||
| -rw-r--r-- | 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 7136e1f..0b21179 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 7136e1f..0b21179 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 7136e1f..0b21179 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 */ |
