diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-06-03 11:29:16 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-07-02 09:52:33 -0400 |
| commit | ac7f54e655881044eb11187a10158ac791fa9890 (patch) | |
| tree | 7157070c91e7664776fedecc3b681491310d4bee /loader | |
| parent | 73ad4ceea135b59d6d509b721a6eb358694e672b (diff) | |
| download | anaconda-ac7f54e655881044eb11187a10158ac791fa9890.tar.gz anaconda-ac7f54e655881044eb11187a10158ac791fa9890.tar.xz anaconda-ac7f54e655881044eb11187a10158ac791fa9890.zip | |
network --bootproto no longer implies DHCP.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/net.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/loader/net.c b/loader/net.c index d4c63906e..1c35ac522 100644 --- a/loader/net.c +++ b/loader/net.c @@ -1544,11 +1544,9 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc, poptFreeContext(optCon); } - /* if they've specified dhcp/bootp or haven't specified anything, - * use dhcp for the interface */ - if ((bootProto && (!strncmp(bootProto, "dhcp", 4) || - !strncmp(bootProto, "bootp", 4))) || - (!bootProto && !loaderData->ipv4)) { + /* if they've specified dhcp/bootp use dhcp for the interface */ + if (bootProto && (!strncmp(bootProto, "dhcp", 4) || + !strncmp(bootProto, "bootp", 4))) { loaderData->ipv4 = strdup("dhcp"); loaderData->ipinfo_set = 1; } else if (loaderData->ipv4) { |