[PATCH 1/2] Retry network configuration in loader (#492009)

[David Cantrell <dcantrell redhat com>]

Rewrite disabled network configuration scripts in loader if we ask the
user to retry network configuration.  nm-system-settings will pick up
the change to those files and down those interfaces.
---
 loader/loader.c |    2 +-
 loader/net.c    |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index 7b3eb0c..f960c28 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1378,7 +1378,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
                                      _("OK"), _("Back"), NULL);
                 }
 
-                if (rc && rc != 1) {
+                if (rc && (rc != 1) && (loaderData->method == -1)) {
                     loaderData->method = -1;
                     step = STEP_KBD;
                     dir = -1;
diff --git a/loader/net.c b/loader/net.c
index 47e2346..bebabcd 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -2,7 +2,7 @@
  * net.c
  *
  * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005  Red Hat, Inc.
- *               2006, 2007, 2008
+ *               2006, 2007, 2008, 2009
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1939,6 +1939,11 @@ int kickstartNetworkUp(struct loaderData_s * loaderData, iface_t * iface) {
             /* Going back to the interface selection screen, so unset anything
              * we set before attempting to bring the incorrect interface up.
              */
+            if ((rc = writeDisabledNetInfo()) != 0) {
+                logMessage(ERROR, "writeDisabledNetInfo failure (%s): %d",
+                           __func__, rc);
+            }
+
             loaderData->netDev_set = 0;
             loaderData->ipinfo_set = 0;
             free(loaderData->ipv4);
-- 
1.6.2.2