d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement compiled-in config file handling a little better - now

Browse Source 
that there's no filesystem on the boot.flp image we need to prompt
for the configuration floppy.
This commit is contained in:
Jordan K. Hubbard 1997-01-18 16:37:15 +00:00
parent f533d5bfe1
commit 740e9a8981
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/sysinstall/floppy.c
View File

@ -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);

2
release/sysinstall/main.c
View File

@ -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)) {

2
usr.sbin/sade/main.c
View File

@ -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)) {

2
usr.sbin/sysinstall/floppy.c
View File

@ -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);

2
usr.sbin/sysinstall/main.c
View File

@ -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)) {