diff options
| author | Erik Troan <ewt@redhat.com> | 1999-08-07 20:51:02 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 1999-08-07 20:51:02 +0000 |
| commit | 0b65c84fad4c54fc4f86d05c0ec418f3998d2d8f (patch) | |
| tree | 52f5e9033b6ad5b074da950b81cad7c2fc26ddce /loader/loader.c | |
| parent | 9897daddfeab5904e14b0eeeabefe3e12b8bacf6 (diff) | |
| download | anaconda-0b65c84fad4c54fc4f86d05c0ec418f3998d2d8f.tar.gz anaconda-0b65c84fad4c54fc4f86d05c0ec418f3998d2d8f.tar.xz anaconda-0b65c84fad4c54fc4f86d05c0ec418f3998d2d8f.zip | |
1) made back work for network setup :-)
2) write out /tmp/netinfo
Diffstat (limited to 'loader/loader.c')
| -rw-r--r-- | loader/loader.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/loader/loader.c b/loader/loader.c index c4a9c4042..3c63863f2 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -35,7 +35,6 @@ #include <unistd.h> #include "isys/imount.h" -#include "pump/pump.h" #include "isys/isys.h" #include "isys/probe.h" #include "isys/pci/pciprobe.h" @@ -293,9 +292,9 @@ static int ensureNetDevice(struct knownDevices * kd, static int mountNfsImage(char * location, struct knownDevices * kd, moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps, int flags) { - struct pumpNetIntf netDev; + static struct networkDeviceConfig netDev; char * devName; - int i; + int i, rc; char * host = NULL; char * dir = NULL; char * fullPath; @@ -303,12 +302,14 @@ static int mountNfsImage(char * location, struct knownDevices * kd, i = ensureNetDevice(kd, modInfo, modLoaded, modDeps, flags, &devName); if (i) return i; - readNetConfig(devName, &netDev, flags); - nfsGetSetup(&host, &dir); + do { + rc = readNetConfig(devName, &netDev, flags); + if (rc) return rc; + } while (nfsGetSetup(&host, &dir) == LOADER_BACK); + if (!FL_TESTING(flags)) { - pumpSetupInterface(&netDev); - pumpSetupDefaultGateway(&netDev.gateway); + configureNetwork(&netDev); mlLoadModule("nfs", modLoaded, modDeps, flags); @@ -318,6 +319,8 @@ static int mountNfsImage(char * location, struct knownDevices * kd, logMessage("mounting nfs path %s", fullPath); doPwMount(fullPath, "/mnt/source", "nfs", 1, 0, NULL, NULL); + + writeNetInfo("/tmp/netinfo", &netDev); } free(host); @@ -365,13 +368,11 @@ static int doMountImage(char * location, struct knownDevices * kd, rc = newtWinMenu(_("Installation Method"), _("What type of media contains the packages to be " "installed?"), 30, 10, 20, 6, installNames, - &methodNum, _("Ok"), _("Back"), NULL); - - if (rc == 2) return LOADER_BACK; + &methodNum, _("Ok"), NULL); rc = installMethods[validMethods[methodNum]].mountImage(location, kd, modInfo, modLoaded, modDeps, flags); - } while (rc == 2); + } while (rc); return 0; } |