From ac7f54e655881044eb11187a10158ac791fa9890 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Wed, 3 Jun 2009 11:29:16 -0400
Subject: network --bootproto no longer implies DHCP.

---
 loader/net.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'loader')

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) {
-- 
cgit