On Fri, Apr 01, 2011 at 10:11:28AM -0400, Chris Lumens wrote:
> > diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
> > index 73dedcd..685062b 100644
> > --- a/loader/nfsinstall.c
> > +++ b/loader/nfsinstall.c
> > @@ -401,7 +401,8 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc,
> >
> > substr = strstr(dir, ".img");
> > if (!substr || (substr && *(substr+4) != '\0')) {
> > - checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s", host, dir);
> > + checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s:%s",
> > + mountOpts, host, dir);
> >
> > logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'",
> > host, dir, mountOpts);
>
> If mountOpts is NULL here, you're going to get a string like
> "nfs::blah:blah". Can stage2 handle that?
Also, is that order correct? On master we use a different order, as well
as check for mountOpts being null:
if (isNotEmpty(optsObj)) {
logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'",
host, dir, PyString_AsString(optsObj));
checked_asprintf(&loaderData->instRepo, "nfs:%s:%s:%s",
PyString_AsString(optsObj), host, dir);
} else {
logMessage(INFO, "results of nfs, host is %s, dir is %s", host, dir);
checked_asprintf(&loaderData->instRepo, "nfs:%s:%s", host, dir);
}
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
Attachment:
pgpSqga7jGryQ.pgp
Description: PGP signature
_______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
