[PATCH - 497334] change the basic assumption about kickstart network

[Chris Lumens]

These two patches change one of the basic operating assumptions about the
network command in kickstart.

Before:  No "network" command implies dhcp
Now:  No "network" command implies stop and ask in stage1

This brings the network command in line with how everything else in kickstart,
and also gets rid of the obnoxious and short lived --bootproto=query, though it
will still have to be recognized for compatibility reasons.

- Chris

[PATCH 1/2] Don't unconditionally skip the network config screen in kickstart.

[Chris Lumens]

This means you have to provide a network line in the kickstart file if you
want the network to be automatically configured, therefore bringing the
network command in line with how all the other kickstart commands work.
---
 loader/net.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/loader/net.c b/loader/net.c
index 4a58c60..d4c6390 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -618,18 +618,16 @@ int configureTCPIP(char * device, iface_t * iface,
      *     noipv4 noipv6
      *     ip=<val> noipv6
      *     ipv6=<val> noipv4
-     * we also skip this form for anyone doing a kickstart install
      */
     if ((FL_IP_PARAM(flags) && FL_IPV6_PARAM(flags)) ||
         (FL_IP_PARAM(flags) && FL_NOIPV6(flags)) ||
         (FL_IPV6_PARAM(flags) && FL_NOIPV4(flags)) ||
-        (FL_NOIPV4(flags) && FL_NOIPV6(flags)) ||
-        (FL_IS_KICKSTART(flags))) {
+        (FL_NOIPV4(flags) && FL_NOIPV6(flags))) {
         skipForm = 1;
         newtPopWindow();
     }
 #else
-    if (FL_IP_PARAM(flags) || FL_NOIPV4(flags) || FL_IS_KICKSTART(flags)) {
+    if (FL_IP_PARAM(flags) || FL_NOIPV4(flags)) {
         skipForm = 1;
         newtPopWindow();
     }

[PATCH 2/2] network --bootproto no longer implies DHCP.

[Chris Lumens]

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

diff --git a/loader/net.c b/loader/net.c
index d4c6390..1c35ac5 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) {

[David Lehman]

On Wed, 2009-07-01 at 13:57 -0400, Chris Lumens wrote:
> These two patches change one of the basic operating assumptions about the
> network command in kickstart.
>
> Before:  No "network" command implies dhcp
> Now:  No "network" command implies stop and ask in stage1

Looks good to me.
> This brings the network command in line with how everything else in kickstart,
> and also gets rid of the obnoxious and short lived --bootproto=query, though it
> will still have to be recognized for compatibility reasons.
> Chris
>
> Anaconda-devel-list mailing list
> [e-mail]
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list