[PATCH] Fetch ks files over NFS when ksdevice is not given (#541873)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Fixes up a problem that occurs when users pass:

    ks=nfs:HOST:PATH

But do not pass ksdevice.  The kickstartNetworkUp() function returns
early because NetworkManager is running and has a connection, but when
loader tries to pull the file over NFS, it looks for the network device
in loaderData->netDev, but kickstartNetworkUp() never filled that
information in.

Seems to only occur on s390x.  Tested on both s390x and x86_64.
---
 loader/net.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/loader/net.c b/loader/net.c
index 9e4daa1..24f4cf3 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -1924,7 +1924,8 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) {
 int kickstartNetworkUp(struct loaderData_s * loaderData, iface_t * iface) {
     int rc, err;
 
-    if (is_nm_connected() == TRUE)
+    if ((is_nm_connected() == TRUE) &&
+        (loaderData->netDev != NULL) && (loaderData->netDev_set == 1))
         return 0;
 
     memset(iface, 0, sizeof(*iface));
-- 
1.6.6.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux