diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-04-24 15:46:31 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-04-24 15:46:31 +0000 |
| commit | 0a562126d84c59a113231ae7ab38984f92d62153 (patch) | |
| tree | 5e87b9094f4ebdc328979e3a0640dee5f1fc40cb /loader2/nfsinstall.c | |
| parent | dd200d781bd9012f562399c2ee69c23fe60d86b9 (diff) | |
| download | anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.gz anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.xz anaconda-0a562126d84c59a113231ae7ab38984f92d62153.zip | |
another taroon merge. tagged before as before-taroon-merge, after as
after-taroon-merge
this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.
Diffstat (limited to 'loader2/nfsinstall.c')
| -rw-r--r-- | loader2/nfsinstall.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c index e08339551..6f422ade0 100644 --- a/loader2/nfsinstall.c +++ b/loader2/nfsinstall.c @@ -118,7 +118,8 @@ char * mountNfsImage(struct installMethod * method, setupNetworkDeviceConfig(&netDev, loaderData, flags); rc = readNetConfig(devName, &netDev, flags); - if (rc) { + if ((rc == LOADER_BACK) || (rc == LOADER_ERROR) || + ((dir == -1) && (rc == LOADER_NOOP))) { stage = NFS_STAGE_IFACE; dir = -1; break; @@ -128,7 +129,7 @@ char * mountNfsImage(struct installMethod * method, case NFS_STAGE_NFS: logMessage("going to do nfsGetSetup"); - if (loaderData->method && + if (loaderData->method && *loaderData->method && !strncmp(loaderData->method, "nfs", 3) && loaderData->methodData) { host = ((struct nfsInstallData *)loaderData->methodData)->host; |