[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: WTF? Inaccessible bug reports?



On Tue, Nov 20, 2007 at 05:21:55PM +0100, Marek Mahut wrote:
> #260621 is not Fedora bug at all. Where did you found the number for
> reference? In anaconda commit?

Yep.

commit e727238ded39f839b8230e0fef25825815336a68
Author: David Cantrell <dcantrell redhat com>
Date:   Tue Sep 4 18:17:33 2007 +0000

            * loader2/loader.c (doLoaderMain): In STEP_IFACE, if we are doing
            a kickstart install, flag it. Init ipv4method and ipv6method (#260621).
            * loader2/loader.h: Add LOADER_FLAGS_IS_KICKSTART and
            FL_IS_KICKSTART() (#260621).
            * loader2/net.c (configureTCPIP): Set skipForm to 1 if kickstart
            flag is set (#260621).

diff --git a/ChangeLog b/ChangeLog
index d688e95..58c1d02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,13 @@
 	* iw/network_gui.py (NetworkWindow.setupDevices): Do not assume we
 	have HWADDR or DESC when generating tooltip.
 
+	* loader2/loader.c (doLoaderMain): In STEP_IFACE, if we are doing
+	a kickstart install, flag it. Init ipv4method and ipv6method (#260621).
+	* loader2/loader.h: Add LOADER_FLAGS_IS_KICKSTART and
+	FL_IS_KICKSTART() (#260621).
+	* loader2/net.c (configureTCPIP): Set skipForm to 1 if kickstart
+	flag is set (#260621).
+
 2007-09-04  Chris Lumens  <clumens redhat com>
 
 	* backend.py (AnacondaBackend.writePackagesKS, writeConfiguration):
diff --git a/loader2/loader.c b/loader2/loader.c
index 5d7107e..7291066 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1128,6 +1128,11 @@ static char *doLoaderMain(char * location,
             /* fall through to interface selection */
         case STEP_IFACE:
             logMessage(INFO, "going to pick interface");
+
+            /* skip configureTCPIP() screen for kickstart (#260621) */
+            if (loaderData->ksFile)
+                flags |= LOADER_FLAGS_IS_KICKSTART;
+
             loaderData->ipinfo_set = 0;
             loaderData->ipv6info_set = 0;
 
diff --git a/loader2/loader.h b/loader2/loader.h
index 7ab83bb..ecc7a23 100644
--- a/loader2/loader.h
+++ b/loader2/loader.h
@@ -45,6 +45,7 @@
 #define LOADER_FLAGS_NOIPV6             (((uint64_t) 1) << 32)
 #define LOADER_FLAGS_IP_PARAM           (((uint64_t) 1) << 33)
 #define LOADER_FLAGS_IPV6_PARAM         (((uint64_t) 1) << 34)
+#define LOADER_FLAGS_IS_KICKSTART       (((uint64_t) 1) << 35)
 
 #define FL_TESTING(a)            ((a) & LOADER_FLAGS_TESTING)
 #define FL_EXPERT(a)             ((a) & LOADER_FLAGS_EXPERT)
@@ -85,6 +86,7 @@
 #define FL_NOIPV6(a)             ((a) & LOADER_FLAGS_NOIPV6)
 #define FL_IP_PARAM(a)           ((a) & LOADER_FLAGS_IP_PARAM)
 #define FL_IPV6_PARAM(a)         ((a) & LOADER_FLAGS_IPV6_PARAM)
+#define FL_IS_KICKSTART(a)       ((a) & LOADER_FLAGS_IS_KICKSTART)
 
 void startNewt(void);
 void stopNewt(void);
diff --git a/loader2/net.c b/loader2/net.c
index 720b54c..60e0cfb 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -701,6 +701,9 @@ int configureTCPIP(char * device, struct networkDeviceConfig * cfg,
     newtComponent ipv4Checkbox, ipv6Checkbox, v4Method[2], v6Method[3];
     newtGrid grid, checkgrid, buttons;
 
+    newCfg->ipv4method = -1;
+    newCfg->ipv6method = -1;
+
     /* UI WINDOW 1: ask for ipv4 choice, ipv6 choice, and conf methods */
 
     /* IPv4 checkbox */
@@ -777,12 +780,15 @@ int configureTCPIP(char * device, struct networkDeviceConfig * cfg,
      *     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_NOIPV4(flags) && FL_NOIPV6(flags)) ||
+        (FL_IS_KICKSTART(flags))) {
         skipForm = 1;
+        newtPopWindow();
     }
 
     /* run the form */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]