d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bogon I introduced while adding disks menu to label editor.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1997-10-14 14:41:17 +00:00
parent 34a6a33036
commit 5b937d60ee
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/sysinstall/label.c
View File

@ -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 */

8
usr.sbin/sade/label.c
View File

@ -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 */

8
usr.sbin/sysinstall/label.c
View File

@ -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 */