diff options
| -rw-r--r-- | usr.sbin/sade/disks.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sade/label.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sade/sade.h | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/disks.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/label.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 1 |
6 files changed, 18 insertions, 8 deletions
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 495338b..bc36501 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -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]); diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index b9752d56..af273e6 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -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]); diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index eb989d1..a137b52 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -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" diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 495338b..bc36501 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -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]); diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c index b9752d56..af273e6 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/label.c @@ -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]); diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index eb989d1..a137b52 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -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" |
