diff options
author | David Cantrell <dcantrell@redhat.com> | 2009-04-21 15:25:41 -1000 |
---|---|---|
committer | David Cantrell <dcantrell@redhat.com> | 2009-04-30 11:26:30 -1000 |
commit | ea1f22b7c4d83351b0fc7d97c462f0a494764601 (patch) | |
tree | d865a9d82e77d54fc210e875e190e70c7c1dcaa9 /loader/net.c | |
parent | 475bd88dec96d15cb6a3ee8a29468eba05bd3836 (diff) | |
download | anaconda-ea1f22b7c4d83351b0fc7d97c462f0a494764601.tar.gz anaconda-ea1f22b7c4d83351b0fc7d97c462f0a494764601.tar.xz anaconda-ea1f22b7c4d83351b0fc7d97c462f0a494764601.zip |
Configure network in kickstartNetworkUp() iff NM is not connected (#490518)
In kickstartNetworkUp(), call is_nm_connected() to see if we are in
NM_STATE_CONNECTED. If we are in any other state, prompt for network
configuration and start NetworkManager.
Diffstat (limited to 'loader/net.c')
-rw-r--r-- | loader/net.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/loader/net.c b/loader/net.c index 3a3fae9d1..47e234609 100644 --- a/loader/net.c +++ b/loader/net.c @@ -1893,6 +1893,9 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) { int kickstartNetworkUp(struct loaderData_s * loaderData, iface_t * iface) { int rc, err; + if (is_nm_connected() == TRUE) + return 0; + memset(iface, 0, sizeof(*iface)); do { |