diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c index b58501650bb1..c146f49b21b9 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 a207fb18ce97..5a3d56e74525 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)) { diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c index a207fb18ce97..5a3d56e74525 100644 --- a/usr.sbin/sade/main.c +++ b/usr.sbin/sade/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)) { diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c index b58501650bb1..c146f49b21b9 100644 --- a/usr.sbin/sysinstall/floppy.c +++ b/usr.sbin/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/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c index a207fb18ce97..5a3d56e74525 100644 --- a/usr.sbin/sysinstall/main.c +++ b/usr.sbin/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)) {