diff options
| author | David Cantrell <dcantrell@redhat.com> | 2008-10-06 16:54:06 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2008-10-06 17:19:04 -1000 |
| commit | a25bddc78aac82cbe3157ee31338122c95c8bdfc (patch) | |
| tree | bef18382d8c9c9c7df6913f82f1c2e23358354b3 | |
| parent | 11a6f646b6614d254bbdd989c0fd6bf659784a36 (diff) | |
| download | anaconda-a25bddc78aac82cbe3157ee31338122c95c8bdfc.tar.gz anaconda-a25bddc78aac82cbe3157ee31338122c95c8bdfc.tar.xz anaconda-a25bddc78aac82cbe3157ee31338122c95c8bdfc.zip | |
Honor static net parameters with NM (#465270)
When the user specifies ip=, netmask=, gateway=, and dns=...use
them.
| -rw-r--r-- | loader/loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/loader.c b/loader/loader.c index 1e6acb97a..c28218cf9 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -780,7 +780,7 @@ static void parseCmdLineIp(struct loaderData_s * loaderData, char *argv) start = argv + 3; end = strstr(start, ":"); loaderData->ipv4 = strndup(start, end-start); - loaderData->ipinfo_set = 0; + loaderData->ipinfo_set = 1; /* Boot server */ if (end + 1 == '\0') @@ -809,10 +809,10 @@ static void parseCmdLineIp(struct loaderData_s * loaderData, char *argv) loaderData->netmask = strdup(start); } else { loaderData->ipv4 = strdup(argv + 3); - loaderData->ipinfo_set = 0; + loaderData->ipinfo_set = 1; } - if (loaderData->ipinfo_set || !strncmp(loaderData->ipv4, "dhcp", 4)) + if (loaderData->ipinfo_set) flags |= LOADER_FLAGS_IP_PARAM; } |