From c23f4ee59f6ae0e8286e84b088562c6a17d3307a Mon Sep 17 00:00:00 2001 From: Doug White Date: Sat, 2 Jul 2005 22:34:22 +0000 Subject: [PATCH] Don't ask about CD numbers if not installing from CD. Approved by: re --- usr.sbin/sysinstall/index.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c index ef685644a567..338f939f5fa6 100644 --- a/usr.sbin/sysinstall/index.c +++ b/usr.sbin/sysinstall/index.c @@ -695,16 +695,18 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended) * Prompt user if the package is not available on the current volume. */ - while (id->volume != dev->volume) { - if (!msgYesNo("This is disc #%d. Package %s is on disc #%d\n" - "Would you like to switch discs now?\n", dev->volume, - id->name, id->volume)) { + if(mediaDevice->type == DEVICE_TYPE_CDROM) { + while (id->volume != dev->volume) { + if (!msgYesNo("This is disc #%d. Package %s is on disc #%d\n" + "Would you like to switch discs now?\n", dev->volume, + id->name, id->volume)) { DEVICE_SHUTDOWN(mediaDevice); msgConfirm("Please remove disc #%d from your drive, and add disc #%d\n", dev->volume, id->volume); DEVICE_INIT(mediaDevice); - } else { - return DITEM_FAILURE; + } else { + return DITEM_FAILURE; + } } }