From 5dfcc5315d8548e548f9ef4a7cfd59c7af13cdc8 Mon Sep 17 00:00:00 2001 From: jhb Date: Fri, 31 May 2002 13:38:17 +0000 Subject: Add a 'diskInteractive' variable that can be set to interactively partition and label a disk from a sysinstall script. --- usr.sbin/sysinstall/disks.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'usr.sbin/sysinstall/disks.c') 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]); -- cgit v1.1