summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2007-03-21 21:06:48 +0000
committerDavid Cantrell <dcantrell@redhat.com>2007-03-21 21:06:48 +0000
commitf3ffd9d2ce64f9bbdf650e1f05c1d3beeeffe7ef (patch)
tree00e37aa666b1b07aece04294304b698d10acfcf2
parent5574fc323590cc6bdb3c3a58b94392a03004ef3b (diff)
downloadanaconda-f3ffd9d2ce64f9bbdf650e1f05c1d3beeeffe7ef.tar.gz
anaconda-f3ffd9d2ce64f9bbdf650e1f05c1d3beeeffe7ef.tar.xz
anaconda-f3ffd9d2ce64f9bbdf650e1f05c1d3beeeffe7ef.zip
* loader2/loader.c (parseCmdLineIp): Don't set ipinfo_set to true here,
otherwise we don't bring the interface up later when we need to. Just collect information here (#233152).
-rw-r--r--ChangeLog6
-rw-r--r--loader2/loader.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a8b37bfc7..8fafa42d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-21 David Cantrell <dcantrell@redhat.com>
+
+ * loader2/loader.c (parseCmdLineIp): Don't set ipinfo_set to true here,
+ otherwise we don't bring the interface up later when we need to. Just
+ collect information here (#233152).
+
2007-03-21 Chris Lumens <clumens@redhat.com>
* textw/timezone_text.py (TimezoneWindow.__call__): Fix traceback
diff --git a/loader2/loader.c b/loader2/loader.c
index fb654fc07..aa8101e32 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -514,7 +514,7 @@ static void parseCmdLineIp(struct loaderData_s * loaderData, char *argv)
start = argv + 3;
end = strstr(start, ":");
loaderData->ip = strndup(start, end-start);
- loaderData->ipinfo_set = 1;
+ loaderData->ipinfo_set = 0;
/* Boot server */
if (end + 1 == '\0')
@@ -542,7 +542,7 @@ static void parseCmdLineIp(struct loaderData_s * loaderData, char *argv)
loaderData->netmask = strdup(start);
} else {
loaderData->ip = strdup(argv + 3);
- loaderData->ipinfo_set = 1;
+ loaderData->ipinfo_set = 0;
}
}