diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-05-20 15:26:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-05-20 15:26:00 +0000 |
| commit | 1f3bf130e3705ed4d77af08cf51c12128ab5424d (patch) | |
| tree | 9f5d2f3b64e7aa17b261e911cb1fff0547451e7d /loader2/net.c | |
| parent | 445f36acfd30cd71b89e8ed7385b74cb9da0f2dc (diff) | |
| download | anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.tar.gz anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.tar.xz anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.zip | |
merge from taroon branch to HEAD. mostly the package stuff, but also
msw's ctrl-alt-del thing and some arch fixups
Diffstat (limited to 'loader2/net.c')
| -rw-r--r-- | loader2/net.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/loader2/net.c b/loader2/net.c index 0e4fc1925..d8c6d1bcb 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -314,7 +314,7 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) { if (!cfg->noDns) writeResolvConf(cfg); - return 0; + return LOADER_NOOP; } text = newtTextboxReflowed(-1, -1, @@ -489,12 +489,7 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) { writeResolvConf(cfg); } - /* JKFIXME: this is a hack */ -#if !defined(__s390__) && !defined(__s390x__) return 0; -#else - return LOADER_NOOP; -#endif } int configureNetwork(struct networkDeviceConfig * dev) { @@ -803,7 +798,7 @@ int kickstartNetworkUp(struct knownDevices * kd, setupNetworkDeviceConfig(netCfgPtr, loaderData, flags); rc = readNetConfig(loaderData->netDev, netCfgPtr, flags); - if (rc) { + if ((rc == LOADER_BACK) || (rc == LOADER_ERROR)) { logMessage("unable to setup networking"); return -1; } |