mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

Recover gracefully if the user puts in the wrong CD volume after being

Browse Source 
prompted to insert another CD for a package.

MFC After:	3 days
This commit is contained in:
Murray Stokely 2005-03-18 00:55:12 +00:00
parent 3ea9d07445
commit 06060d5d6d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=143774
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/sysinstall/index.c
View File

@ -686,10 +686,10 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
return DITEM_SUCCESS;
/*
* What if the package is not available on the current media volume?
*
* Prompt user if the package is not available on the current volume.
*/
if (id->volume != dev->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)) {
@ -697,8 +697,6 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
msgConfirm("Please remove disc #%d from your drive, and add disc #%d\n",
dev->volume, id->volume);
DEVICE_INIT(mediaDevice);
/* XXX, at this point we check to see if this is the
* correct disc, and if not, we loop */
} else {
return DITEM_FAILURE;
}