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

Move the check for which disc volume we have/want to after we install

Browse Source 
the package dependencies.  Installation of the dependencies may leave
us on the wrong disc volume.

MFC after:	3 days
This commit is contained in:
Ken Smith 2006-11-19 08:12:54 +00:00
parent fa5c72f583
commit baddd88f3f
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,25 +692,6 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
if (id->installed == 1)
return DITEM_SUCCESS;
/*
* Prompt user if the package is not available on the current 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;
}
}
}
if (id && id->deps && strlen(id->deps)) {
char t[2048 * 8], *cp, *cp2;
@ -742,6 +723,21 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
}
/* Done with the deps? Load the real m'coy */
if (DITEM_STATUS(status) == DITEM_SUCCESS) {
/* Prompt user if the package is not available on the current 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;
}
}
}
status = package_extract(dev, who->name, depended);
if (DITEM_STATUS(status) == DITEM_SUCCESS)
id->installed = 1;