diff options
| author | jkh <jkh@FreeBSD.org> | 1997-01-18 16:37:15 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-01-18 16:37:15 +0000 |
| commit | 870186b0494583b544c0a486ce63fadf8c1435ac (patch) | |
| tree | da692ed687dce43dd5d0b5105ec2933d01c7741e /release | |
| parent | eb0ff1925c0f48f6d92c1a96bcde0acef654e5d1 (diff) | |
| download | FreeBSD-src-870186b0494583b544c0a486ce63fadf8c1435ac.zip FreeBSD-src-870186b0494583b544c0a486ce63fadf8c1435ac.tar.gz | |
Implement compiled-in config file handling a little better - now
that there's no filesystem on the boot.flp image we need to prompt
for the configuration floppy.
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/floppy.c | 2 | ||||
| -rw-r--r-- | release/sysinstall/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c index b585016..c146f49 100644 --- a/release/sysinstall/floppy.c +++ b/release/sysinstall/floppy.c @@ -128,7 +128,7 @@ mediaInitFloppy(Device *dev) msgDebug("Init floppy called for %s distribution.\n", distWanted ? distWanted : "some"); if (!distWanted) msgConfirm("Please insert floppy for %s", dev->description); - else if (distWanted != (char *)1) /* 1 is kludge for "don't ask!" */ + else msgConfirm("Please insert floppy containing %s for %s", distWanted, dev->description); memset(&dosargs, 0, sizeof dosargs); diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c index a207fb1..5a3d56e 100644 --- a/release/sysinstall/main.c +++ b/release/sysinstall/main.c @@ -135,7 +135,7 @@ main(int argc, char **argv) extern char *distWanted; /* Tell mediaSetFloppy() to try floppy now */ - distWanted = (char *)1; + 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)) { |
