summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/index.c
diff options
context:
space:
mode:
authordwhite <dwhite@FreeBSD.org>2005-07-02 22:34:22 +0000
committerdwhite <dwhite@FreeBSD.org>2005-07-02 22:34:22 +0000
commitdd5c43b57252ea9dec17cd9c876da75544db45c4 (patch)
tree6ec7f78022cbcf288a3a092a688ff7609c85211a /usr.sbin/sysinstall/index.c
parent019106f6e576eb8e05e7b5b562d7115dd05ba567 (diff)
downloadFreeBSD-src-dd5c43b57252ea9dec17cd9c876da75544db45c4.zip
FreeBSD-src-dd5c43b57252ea9dec17cd9c876da75544db45c4.tar.gz
Don't ask about CD numbers if not installing from CD.
Approved by: re
Diffstat (limited to 'usr.sbin/sysinstall/index.c')
-rw-r--r--usr.sbin/sysinstall/index.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index ef68564..338f939 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;
+ }
}
}
OpenPOWER on IntegriCloud