diff options
author | jkh <jkh@FreeBSD.org> | 1997-03-19 10:09:28 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-03-19 10:09:28 +0000 |
commit | d3a9bd86865e3c7ed849dc900473a6881ea729d0 (patch) | |
tree | 576efe220a8f1ff456854a3785787426f0039ac5 /usr.sbin/sade/main.c | |
parent | 73f859e84e05e331692ca97199ad656c3f163946 (diff) | |
download | FreeBSD-src-d3a9bd86865e3c7ed849dc900473a6881ea729d0.zip FreeBSD-src-d3a9bd86865e3c7ed849dc900473a6881ea729d0.tar.gz |
Some of my pending merge changes, Paul Traina's more flexible config
file loading code.
Submitted by: pst
Diffstat (limited to 'usr.sbin/sade/main.c')
-rw-r--r-- | usr.sbin/sade/main.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c index bbd6281..2f1f3a2 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$ + * $Id: main.c,v 1.43 1997/02/22 14:11:55 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -118,32 +118,6 @@ main(int argc, char **argv) } fclose(fp); } -#if defined(LOAD_CONFIG_FILE) - else { - /* If we have a compiled-in startup config file name on - the floppy, look for it and try to load it on startup */ - extern char *distWanted; - - /* Tell mediaSetFloppy() to try floppy now */ - distWanted = LOAD_CONFIG_FILE; - - /* Try to open the floppy drive if we can do that first */ - if (DITEM_STATUS(mediaSetFloppy(NULL)) != DITEM_FAILURE && mediaDevice->init(mediaDevice)) { - fp = mediaDevice->get(mediaDevice, LOAD_CONFIG_FILE, TRUE); - if (fp) { - msgNotify("Loading %s pre-configuration file", LOAD_CONFIG_FILE); - 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); - } - mediaDevice->shutdown(mediaDevice); - } - } -#endif } /* Begin user dialog at outer menu */ |