diff options
| author | jkh <jkh@FreeBSD.org> | 1997-09-16 18:57:18 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-09-16 18:57:18 +0000 |
| commit | cb8ec218f6b133ea876489d516e711e96a6cbc0b (patch) | |
| tree | 177d26a861d654de0819973d2caa3300e0f6fe9b /usr.sbin/sade/main.c | |
| parent | c65e27777ea7d253329b9e7b655fed623cc253fa (diff) | |
| download | FreeBSD-src-cb8ec218f6b133ea876489d516e711e96a6cbc0b.zip FreeBSD-src-cb8ec218f6b133ea876489d516e711e96a6cbc0b.tar.gz | |
Much better dispatch code and scripting support.
Submitted by: pst
Diffstat (limited to 'usr.sbin/sade/main.c')
| -rw-r--r-- | usr.sbin/sade/main.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c index e1672d0..d6d2726 100644 --- a/usr.sbin/sade/main.c +++ b/usr.sbin/sade/main.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: main.c,v 1.45 1997/04/20 16:46:31 jkh Exp $ + * $Id: main.c,v 1.46 1997/06/05 09:47:58 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -104,24 +104,8 @@ main(int argc, char **argv) if (argc > start_arg) systemShutdown(0); } - else { - FILE *fp; - char buf[BUFSIZ]; - - fp = fopen("install.cfg", "r"); - if (fp) { - msgNotify("Loading pre-configuration file"); - variable_set2(VAR_NONINTERACTIVE, "YES"); - while (fgets(buf, sizeof buf, fp)) { - if (DITEM_STATUS(dispatchCommand(buf)) != DITEM_SUCCESS) { - msgDebug("Command `%s' failed - rest of script aborted.\n", buf); - break; - } - } - fclose(fp); - variable_unset(VAR_NONINTERACTIVE); - } - } + else + dispatch_load_file_int(TRUE); status = setjmp(BailOut); if (status) { |
