mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Turns out its not a good idea to assume the packages that might be
selected from the "dists" are all on the current volume. Looks like xorg won't fit on disc1 for 6.4-REL. Iterate through media volumes for packages that wind up being selected from the dists section in addition to the ones that get selected from the packages menu. MFC after: 2 days
This commit is contained in:
parent
924b35eba0
commit
76fe8e96f1
1 changed files with 11 additions and 4 deletions
|
|
@ -55,7 +55,7 @@ int
|
|||
package_add(char *name)
|
||||
{
|
||||
PkgNodePtr tmp;
|
||||
int i;
|
||||
int i, current, low, high;
|
||||
|
||||
if (!mediaVerify())
|
||||
return DITEM_FAILURE;
|
||||
|
|
@ -68,9 +68,16 @@ package_add(char *name)
|
|||
return i;
|
||||
|
||||
tmp = index_search(&Top, name, &tmp);
|
||||
if (tmp)
|
||||
return index_extract(mediaDevice, &Top, tmp, FALSE, 0);
|
||||
else {
|
||||
if (tmp) {
|
||||
if (have_volumes) {
|
||||
low = low_volume;
|
||||
high = high_volume;
|
||||
} else
|
||||
low = high = 0;
|
||||
for (current = low; current <= high; current++)
|
||||
i = index_extract(mediaDevice, &Top, tmp, FALSE, current);
|
||||
return i;
|
||||
} else {
|
||||
msgConfirm("Sorry, package %s was not found in the INDEX.", name);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue