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

Only need to call label editor for all drives.

Browse Source
This commit is contained in:
jkh 1997-10-13 11:33:27 +00:00
parent dbc8e667b2
commit 6438c7d7cd
3 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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.76 1997/09/20 06:24:17 jkh Exp $
* $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -130,17 +130,11 @@ diskLabelEditor(dialogMenuItem *self)
return DITEM_FAILURE;
}
else if (cnt) {
int j;
/* Some are already selected */
for (j = 0; j < cnt; j++) {
if (devs[j]->enabled) {
if (variable_get(VAR_NONINTERACTIVE))
i |= diskLabelNonInteractive(devs[j]);
else
i |= diskLabel(devs[j]);
}
}
if (variable_get(VAR_NONINTERACTIVE))
i |= diskLabelNonInteractive(devs[0]);
else
i |= diskLabel(devs[0]);
}
else {
/* No disks are selected, fall-back case now */

16
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.76 1997/09/20 06:24:17 jkh Exp $
* $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -130,17 +130,11 @@ diskLabelEditor(dialogMenuItem *self)
return DITEM_FAILURE;
}
else if (cnt) {
int j;
/* Some are already selected */
for (j = 0; j < cnt; j++) {
if (devs[j]->enabled) {
if (variable_get(VAR_NONINTERACTIVE))
i |= diskLabelNonInteractive(devs[j]);
else
i |= diskLabel(devs[j]);
}
}
if (variable_get(VAR_NONINTERACTIVE))
i |= diskLabelNonInteractive(devs[0]);
else
i |= diskLabel(devs[0]);
}
else {
/* No disks are selected, fall-back case now */

16
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.76 1997/09/20 06:24:17 jkh Exp $
* $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -130,17 +130,11 @@ diskLabelEditor(dialogMenuItem *self)
return DITEM_FAILURE;
}
else if (cnt) {
int j;
/* Some are already selected */
for (j = 0; j < cnt; j++) {
if (devs[j]->enabled) {
if (variable_get(VAR_NONINTERACTIVE))
i |= diskLabelNonInteractive(devs[j]);
else
i |= diskLabel(devs[j]);
}
}
if (variable_get(VAR_NONINTERACTIVE))
i |= diskLabelNonInteractive(devs[0]);
else
i |= diskLabel(devs[0]);
}
else {
/* No disks are selected, fall-back case now */