On Fri, 11 Jul 2008, Jeremy Katz wrote:
The problem is that you could be loading your driver disk off of
something that comes from a storage driver (which comment in the code
aside, is supported now). By not loading storage drivers, you then
don't have the driver for where you may be grabbing your driver disk.
Good point.
I've modified the patch to only turn on LOADER_FLAGS_NOSTORAGE if
loaderData.ddsrc matches 'nfs:', 'ftp://', or 'http://'. It will still
load the storage drivers if using 'cdrom' or 'path:'
Will that work?
Jeff
--- anaconda-11.1.2.113/loader2/loader.c.orig 2008-04-16 04:34:50.000000000 -0500
+++ anaconda-11.1.2.113/loader2/loader.c 2008-07-11 17:51:40.000000000 -0500
@@ -1580,13 +1580,18 @@
*/
earlyModuleLoad(modInfo, modLoaded, modDeps, 0);
- busProbe(modInfo, modLoaded, modDeps, 0);
-
- /* JKFIXME: we'd really like to do this before the busprobe, but then
- * we won't have network devices available (and that's the only thing
- * we support with this right now */
if (loaderData.ddsrc != NULL) {
+ if (!strncmp(loaderData.ddsrc, "nfs:", 4) ||
+ !strncmp(loaderData.ddsrc, "ftp://";, 6) ||
+ !strncmp(loaderData.ddsrc, "http://";, 7)) {
+ uint64_t save_flags = flags;
+ flags |= LOADER_FLAGS_NOSTORAGE;
+ busProbe(modInfo, modLoaded, modDeps, 0);
+ flags = save_flags;
+ }
getDDFromSource(&loaderData, loaderData.ddsrc);
+ } else {
+ busProbe(modInfo, modLoaded, modDeps, 0);
}
/* JKFIXME: loaderData->ksFile is set to the arg from the command line,
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
