diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-08-20 23:54:51 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-08-20 23:54:51 +0000 |
| commit | dd8951f2026a93111f29b1d6d670e622db1951e3 (patch) | |
| tree | 795f40e92150953edb8b5db5a1dab0436f875bd7 /loader2/net.c | |
| parent | 3960c2c5b13e4e11d54a6d85c33e5675a284a794 (diff) | |
| download | anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.tar.gz anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.tar.xz anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.zip | |
merge changes from taroon branch
Diffstat (limited to 'loader2/net.c')
| -rw-r--r-- | loader2/net.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/loader2/net.c b/loader2/net.c index 97f689a30..f119ada2a 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -315,14 +315,15 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, option[strlen(option) - 1] = '\0'; if (option[0] == '\"') option++; - if (!strncmp(option, "duplex=", 7)) { + if (!strncmp(option, "duplex", 6)) { if (!strncmp(option + 7, "full", 4)) duplex = ETHTOOL_DUPLEX_FULL; else if (!strncmp(option + 7, "half", 4)) duplex = ETHTOOL_DUPLEX_HALF; else logMessage("Unknown duplex setting: %s", option + 7); - } else if (!strncmp("speed=", option, 6)) { + option = strtok(NULL, " "); + } else if (!strncmp("speed", option, 5)) { if (!strncmp(option + 6, "1000", 4)) speed = ETHTOOL_SPEED_1000; else if (!strncmp(option + 6, "100", 3)) @@ -331,6 +332,7 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, speed = ETHTOOL_SPEED_10; else logMessage("Unknown speed setting: %s", option + 6); + option = strtok(NULL, " "); } else { logMessage("Unknown ethtool setting: %s", option); } |