Date: Wed, 22 Oct 2008 20:32:19 +0000 (UTC) From: Ken Smith <kensmith@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184180 - head/usr.sbin/sysinstall Message-ID: <200810222032.m9MKWJ2X038281@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kensmith Date: Wed Oct 22 20:32:19 2008 New Revision: 184180 URL: http://svn.freebsd.org/changeset/base/184180 Log: 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 Modified: head/usr.sbin/sysinstall/package.c Modified: head/usr.sbin/sysinstall/package.c ============================================================================== --- head/usr.sbin/sysinstall/package.c Wed Oct 22 20:24:52 2008 (r184179) +++ head/usr.sbin/sysinstall/package.c Wed Oct 22 20:32:19 2008 (r184180) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810222032.m9MKWJ2X038281>