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

Re: [PATCH] Let users edit net settings on network failure in stage 1 (#465887)





David Cantrell wrote:
This one has been around for a while.  If a user selects the wrong
network interface in loader and waits for the failure message to
appear, they are taken back to the 'select an interface' screen.
They select the right interface, but loader used the TCP/IP settings
entered the first time around.

On network configuration failure and if we are doing an interactive
install, blank out ipv4method and ipv6method so that we take the
user to the TCP/IP configuration screen.  I use ipv4method and
ipv6method to figure out if a kickstart installation is beginning,
so by blanking them out for the interactive install case, we get to
take the user back to the TCP/IP settings screen.

Looks good to me.

Regards,

Hans


---
 loader/net.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/loader/net.c b/loader/net.c
index 846712f..62dc236 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -453,6 +453,8 @@ int readNetConfig(char * device, iface_t * iface,
         if (err) {
             logMessage(ERROR, "failed to write %s data for %s (%d)",
                        SYSCONFIG_PATH, iface->device, err);
+            iface->ipv4method = IPV4_UNUSED_METHOD;
+            iface->ipv6method = IPV6_UNUSED_METHOD;
             return LOADER_BACK;
         }
@@ -463,6 +465,8 @@ int readNetConfig(char * device, iface_t * iface,
             newtWinMessage(_("Network Error"), _("Retry"),
                            _("There was an error configuring your network "
                              "interface."));
+            iface->ipv4method = IPV4_UNUSED_METHOD;
+            iface->ipv6method = IPV6_UNUSED_METHOD;
             return LOADER_BACK;
         }
     }


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