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

[PATCH 1/2 master] Do not reactivate network device needlessly on s390 (#739846)



On s390, the device is activated when NM is started due to ifcfg file
generated by linuxrc.390. There is no need to reactivate it with
the same parameters (it would even lead to fail).

This condition (2nd part) from kickstartNetworkUp was causing
(or perhaps to put it better - not preventing) the ractivation in
case of already having been connected:

    if ((is_nm_connected() == TRUE) &&
        (loaderData->netDev != NULL) && (loaderData->netDev_set == 1))
        return 0;

To satisfy it, just set the values properly in readNetInfo (the patch).
---
 loader/loader.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index b3048cb..5d2dc01 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -746,6 +746,10 @@ static void readNetInfo(struct loaderData_s ** ld) {
         flags |= LOADER_FLAGS_HAVE_CMSCONF;
     }
 
+    loaderData->netDev = device;
+    loaderData->netDev_set = 1;
+
+
     free(cfgfile);
     g_strfreev(lines);
     return;
-- 
1.7.4


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