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

Add a 'diskInteractive' variable that can be set to interactively partition

Browse Source 
and label a disk from a sysinstall script.
This commit is contained in:
John Baldwin 2002-05-31 13:38:17 +00:00
parent 55847cbc30
commit df349781bf
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/sade/disks.c
View File

@ -758,7 +758,8 @@ diskPartitionEditor(dialogMenuItem *self)
/* Some are already selected */
for (i = 0; i < devcnt; i++) {
if (devs[i]->enabled) {
if (variable_get(VAR_NONINTERACTIVE))
if (variable_get(VAR_NONINTERACTIVE) &&
!variable_get(VAR_DISKINTERACTIVE))
diskPartitionNonInteractive(devs[i]);
else
diskPartition(devs[i]);
@ -769,7 +770,8 @@ diskPartitionEditor(dialogMenuItem *self)
/* No disks are selected, fall-back case now */
if (devcnt == 1) {
devs[0]->enabled = TRUE;
if (variable_get(VAR_NONINTERACTIVE))
if (variable_get(VAR_NONINTERACTIVE) &&
!variable_get(VAR_DISKINTERACTIVE))
diskPartitionNonInteractive(devs[0]);
else
diskPartition(devs[0]);

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

@ -163,7 +163,8 @@ diskLabelEditor(dialogMenuItem *self)
}
else if (cnt) {
/* Some are already selected */
if (variable_get(VAR_NONINTERACTIVE))
if (variable_get(VAR_NONINTERACTIVE) &&
!variable_get(VAR_DISKINTERACTIVE))
i = diskLabelNonInteractive(NULL);
else
i = diskLabel(NULL);
@ -173,7 +174,8 @@ diskLabelEditor(dialogMenuItem *self)
cnt = deviceCount(devs);
if (cnt == 1) {
devs[0]->enabled = TRUE;
if (variable_get(VAR_NONINTERACTIVE))
if (variable_get(VAR_NONINTERACTIVE) &&
!variable_get(VAR_DISKINTERACTIVE))
i = diskLabelNonInteractive(devs[0]);
else
i = diskLabel(devs[0]);

1
usr.sbin/sade/sade.h
View File

@ -93,6 +93,7 @@
#define VAR_DEBUG "debug"
#define VAR_DESKSTYLE "_deskStyle"
#define VAR_DISK "disk"
#define VAR_DISKINTERACTIVE "diskInteractive"
#define VAR_DISTS "dists"
#define VAR_DIST_MAIN "distMain"
#define VAR_DIST_CRYPTO "distCRYPTO"

6
usr.sbin/sysinstall/disks.c
View File

@ -758,7 +758,8 @@ diskPartitionEditor(dialogMenuItem *self)
/* Some are already selected */
for (i = 0; i < devcnt; i++) {
if (devs[i]->enabled) {
if (variable_get(VAR_NONINTERACTIVE))
if (variable_get(VAR_NONINTERACTIVE) &&
!variable_get(VAR_DISKINTERACTIVE))
diskPartitionNonInteractive(devs[i]);
else
diskPartition(devs[i]);
@ -769,7 +770,8 @@ diskPartitionEditor(dialogMenuItem *self)
/* No disks are selected, fall-back case now */
if (devcnt == 1) {
devs[0]->enabled = TRUE;
if (variable_get(VAR_NONINTERACTIVE))
if (variable_get(VAR_NONINTERACTIVE) &&
!variable_get(VAR_DISKINTERACTIVE))
diskPartitionNonInteractive(devs[0]);
else
diskPartition(devs[0]);

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

@ -163,7 +163,8 @@ diskLabelEditor(dialogMenuItem *self)
}
else if (cnt) {
/* Some are already selected */
if (variable_get(VAR_NONINTERACTIVE))
if (variable_get(VAR_NONINTERACTIVE) &&
!variable_get(VAR_DISKINTERACTIVE))
i = diskLabelNonInteractive(NULL);
else
i = diskLabel(NULL);
@ -173,7 +174,8 @@ diskLabelEditor(dialogMenuItem *self)
cnt = deviceCount(devs);
if (cnt == 1) {
devs[0]->enabled = TRUE;
if (variable_get(VAR_NONINTERACTIVE))
if (variable_get(VAR_NONINTERACTIVE) &&
!variable_get(VAR_DISKINTERACTIVE))
i = diskLabelNonInteractive(devs[0]);
else
i = diskLabel(devs[0]);

1
usr.sbin/sysinstall/sysinstall.h
View File

@ -93,6 +93,7 @@
#define VAR_DEBUG "debug"
#define VAR_DESKSTYLE "_deskStyle"
#define VAR_DISK "disk"
#define VAR_DISKINTERACTIVE "diskInteractive"
#define VAR_DISTS "dists"
#define VAR_DIST_MAIN "distMain"
#define VAR_DIST_CRYPTO "distCRYPTO"