diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-06-15 20:36:32 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-06-15 20:36:32 +0000 |
| commit | 82f91fb26180b32ec9300c51258bb1acaba0a693 (patch) | |
| tree | d2de6a9e174ece9ff49ede8d2b85a3aecda1bf09 | |
| parent | ed1e9645b166fa45ce1d88037e1b24b4fb531e03 (diff) | |
| download | anaconda-82f91fb26180b32ec9300c51258bb1acaba0a693.tar.gz anaconda-82f91fb26180b32ec9300c51258bb1acaba0a693.tar.xz anaconda-82f91fb26180b32ec9300c51258bb1acaba0a693.zip | |
2006-06-15 Jeremy Katz <katzj@redhat.com>
* loader2/net.c: Hack for s390 to work for now
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | loader2/net.c | 8 |
2 files changed, 10 insertions, 0 deletions
@@ -1,5 +1,7 @@ 2006-06-15 Jeremy Katz <katzj@redhat.com> + * loader2/net.c: Hack for s390 to work for now + * isys/isys.py (inet_ntoa): Fix on 64bit machines * textw/zfcp_text.py (ZFCPWindow.__call__): Fix syntax errors. diff --git a/loader2/net.c b/loader2/net.c index b0b51f6c5..f635b291f 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -403,6 +403,13 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, cfg->isDynamic = 1; cfg->preset = 1; +#if defined(__s390__) || defined(__s390x__) /* FIXME: hack s390 for now */ + } else if (inet_aton(loaderData->ip, &addr)) { + cfg->dev.ip = ip_addr_in(&addr); + cfg->dev.set |= PUMP_INTFINFO_HAS_IP; + cfg->isDynamic = 0; + cfg->preset = 1; +#else } else if (inet_pton(AF_INET, loaderData->ip, &addr)) { cfg->dev.ip = ip_addr_in(&addr); cfg->dev.set |= PUMP_INTFINFO_HAS_IP; @@ -413,6 +420,7 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, cfg->dev.set |= PUMP_INTFINFO_HAS_IP; cfg->isDynamic = 0; cfg->preset = 1; +#endif } else { /* invalid ip information, disable the setting of ip info */ loaderData->ipinfo_set = 0; loaderData->ip = NULL; |