diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-02-20 06:09:24 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-02-20 06:09:24 +0000 |
| commit | 289539b051f22c3709d750b0915a12ecc1085671 (patch) | |
| tree | 2219e54731464d5de3c2d3bca5dd0f0db8af431e /loader2/net.c | |
| parent | 01a7cc807d34300cd4c81b3aba38d796a24207ee (diff) | |
| download | anaconda-289539b051f22c3709d750b0915a12ecc1085671.tar.gz anaconda-289539b051f22c3709d750b0915a12ecc1085671.tar.xz anaconda-289539b051f22c3709d750b0915a12ecc1085671.zip | |
only care about the additional dns servers if we had more to begin with
Diffstat (limited to 'loader2/net.c')
| -rw-r--r-- | loader2/net.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/loader2/net.c b/loader2/net.c index 3aa0a0081..c331fa8c2 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2001 Red Hat, Inc. + * Copyright 1999-2003 Red Hat, Inc. * * All Rights Reserved. * @@ -492,10 +492,12 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) { #endif /* s390 */ /* preserve extra dns servers for the sake of being nice */ - for (i = newCfg.dev.numDns; i < cfg->dev.numDns; i++) { - newCfg.dev.dnsServers[i] = cfg->dev.dnsServers[i]; + if (cfg->dev.numDns > newCfg.dev.numDns) { + for (i = newCfg.dev.numDns; i < cfg->dev.numDns; i++) { + newCfg.dev.dnsServers[i] = cfg->dev.dnsServers[i]; + } + newCfg.dev.numDns = cfg->dev.numDns; } - newCfg.dev.numDns = cfg->dev.numDns; cfg->isDynamic = newCfg.isDynamic; memcpy(&cfg->dev,&newCfg.dev,sizeof(newCfg.dev)); |