diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2011-09-09 14:22:11 +0200 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2011-09-21 10:26:40 +0200 |
| commit | 1cc428a148be1796c1d050a2203e99c6d313519a (patch) | |
| tree | 36850a0fba8cdc2d2281743c9370b734c0cc40a4 /loader | |
| parent | 1703c7bc5efa98cd40f4b410d1649111f6a1a662 (diff) | |
| download | anaconda-1cc428a148be1796c1d050a2203e99c6d313519a.tar.gz anaconda-1cc428a148be1796c1d050a2203e99c6d313519a.tar.xz anaconda-1cc428a148be1796c1d050a2203e99c6d313519a.zip | |
Start NM in loader on s390 until we have systemd init here too (#733680)
This is exactly how we used to do it before systemd took over
starting NM for anaconda - commit 4acfadedb038744e6b47af74fe584188f82e44aa.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/loader/loader.c b/loader/loader.c index 2c5eb5122..b3048cb55 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2177,10 +2177,16 @@ int main(int argc, char ** argv) { } #endif +#if defined(__s390__) || defined(__s390x__) + /* Start NetworkManager until we have systemd init on s390 too */ + if (iface_start_NetworkManager()) + logMessage(INFO, "failed to start NetworkManager"); +#else /* Restart NetworkManager now so that it uses our inital ifcfg config */ logMessage(INFO, "restarting NetworkManager"); if (iface_restart_NetworkManager()) logMessage(ERROR, "failed to restart NetworkManager"); +#endif if (!FL_CMDLINE(flags)) startNewt(); |