FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Gentoo > Gentoo User

 
 
LinkBack Thread Tools
 
Old 02-17-2012, 07:49 PM
David Cantrell
 
Default Followups to prevent NetworkManager from downing s390x interfaces.

These hacks prevent the configured network interfaces from going down
during installation. We can assume that s390x installs will always
have a network connection. There is no other way to start the
installer. Plus, this is all temporary stuff anyway that will change
when we rebase this branch.

Related: rhbz#783227
---
pyanaconda/gui.py | 2 ++
pyanaconda/network.py | 6 +++++-
pyanaconda/rescue.py | 2 ++
pyanaconda/text.py | 2 ++
4 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
index e6fad4b..40c6cb7 100755
--- a/pyanaconda/gui.py
+++ b/pyanaconda/gui.py
@@ -895,6 +895,8 @@ class InstallInterface(InstallInterfaceBase):

# just_setup is used for [Configure Network] button
def enableNetwork(self, just_setup=False):
+ if iutil.isS390():
+ return True

if len(self.anaconda.network.netdevices) == 0:
return False
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 4e64684..339f3c6 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -153,6 +153,9 @@ def nmIsConnected(state):
isys.NM_STATE_CONNECTED_GLOBAL)

def hasActiveNetDev():
+ if iutil.isS390():
+ return True
+
try:
bus = dbus.SystemBus()
nm = bus.get_object(isys.NM_SERVICE, isys.NM_MANAGER_PATH)
@@ -399,7 +402,8 @@ class Network:
# We can filter out storage devices only after
# we have device tree populated. So we do it before
# running nm-c-e and before writing ifcfg files to system.
- self.setNMControlledDevices(self.netdevices.keys() )
+ if not iutil.isS390():
+ self.setNMControlledDevices(self.netdevices.keys() )

def update(self):
ifcfglog.debug("Network.update() called")
diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py
index af564e4..773eec3 100644
--- a/pyanaconda/rescue.py
+++ b/pyanaconda/rescue.py
@@ -94,6 +94,8 @@ class RescueInterface(InstallInterfaceBase):
return OkCancelWindow(self.screen, title, text)

def enableNetwork(self, anaconda):
+ if iutil.isS390():
+ return True
if len(anaconda.network.netdevices) == 0:
return False
from textw.netconfig_text import NetworkConfiguratorText
diff --git a/pyanaconda/text.py b/pyanaconda/text.py
index 6145699..c53e5a5 100644
--- a/pyanaconda/text.py
+++ b/pyanaconda/text.py
@@ -389,6 +389,8 @@ class InstallInterface(InstallInterfaceBase):
return passphrase

def enableNetwork(self):
+ if iutil.isS390():
+ return True
if len(self.anaconda.network.netdevices) == 0:
return False
from textw.netconfig_text import NetworkConfiguratorText
--
1.7.1

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

Thread Tools




All times are GMT. The time now is 07:52 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org