summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sade/disks.c
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-05-31 13:38:17 +0000
committerjhb <jhb@FreeBSD.org>2002-05-31 13:38:17 +0000
commit5dfcc5315d8548e548f9ef4a7cfd59c7af13cdc8 (patch)
tree1ea771d298b3fa41fb23f78bcc69c7703b587dce /usr.sbin/sade/disks.c
parent577d08fe7c0d0fcb36b7d123d00b44f8062d8936 (diff)
downloadFreeBSD-src-5dfcc5315d8548e548f9ef4a7cfd59c7af13cdc8.zip
FreeBSD-src-5dfcc5315d8548e548f9ef4a7cfd59c7af13cdc8.tar.gz
Add a 'diskInteractive' variable that can be set to interactively partition
and label a disk from a sysinstall script.
Diffstat (limited to 'usr.sbin/sade/disks.c')
-rw-r--r--usr.sbin/sade/disks.c6
1 files changed, 4 insertions, 2 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]);
OpenPOWER on IntegriCloud