summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
Diffstat (limited to 'loader')
-rw-r--r--loader/loader.c2
-rw-r--r--loader/net.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/loader/loader.c b/loader/loader.c
index 7b3eb0c2e..f960c28bd 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 47e234609..bebabcd32 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);