aboutsummaryrefslogtreecommitdiff
path: root/release/sysinstall/variable_load.c
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1997-06-22 09:45:41 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1997-06-22 09:45:41 +0000
commitb4cfcc4383a7ed6ae05e547c364ff82f035710a6 (patch)
treece4e9f34262767e5db53644b802ef0a6a1a09a35 /release/sysinstall/variable_load.c
parent172d6524dfdec80c212a1ca1ff27813ee3c59227 (diff)
Notes
Diffstat (limited to 'release/sysinstall/variable_load.c')
-rw-r--r--release/sysinstall/variable_load.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/release/sysinstall/variable_load.c b/release/sysinstall/variable_load.c
index 66b970892d62..16b871c83979 100644
--- a/release/sysinstall/variable_load.c
+++ b/release/sysinstall/variable_load.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
- * $Id: variable_load.c,v 1.7 1997/06/13 07:11:57 jkh Exp $
+ * $Id: variable_load.c,v 1.8 1997/06/13 09:37:25 jkh Exp $
*
* Copyright (c) 1997
* Paul Traina. All rights reserved.
@@ -122,9 +122,13 @@ variableLoad(dialogMenuItem *self)
for (i = 0; i < curr; i++) {
if (DITEM_STATUS(dispatchCommand(list[i])) != DITEM_SUCCESS) {
- msgConfirm("Command `%s' failed - rest of script aborted.\n", buf);
- what |= DITEM_FAILURE;
- break;
+ if (variable_get(VAR_NO_ERROR))
+ variable_unset(VAR_NO_ERROR);
+ else {
+ msgConfirm("Command `%s' failed - rest of script aborted.\n", buf);
+ what |= DITEM_FAILURE;
+ break;
+ }
}
}
strings_free(list, &curr, &max);