diff options
author | Jeremy Katz <katzj@redhat.com> | 2007-10-10 18:30:08 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2007-10-10 18:30:08 +0000 |
commit | c9945be0b668e18308fc6b5890ff85aec11d868b (patch) | |
tree | f57da1715eb997c86e98fd4d13234510d1a36700 | |
parent | 6b6b0fb456ca93b95e162ea7abeb752c219aa595 (diff) | |
download | anaconda-c9945be0b668e18308fc6b5890ff85aec11d868b.tar.gz anaconda-c9945be0b668e18308fc6b5890ff85aec11d868b.tar.xz anaconda-c9945be0b668e18308fc6b5890ff85aec11d868b.zip |
2007-10-10 Jeremy Katz <katzj@redhat.com>
* network.py (NetworkDevice.__str__): Don't traceback with
unconfigured nics (#325071)
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | network.py | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2007-10-10 Jeremy Katz <katzj@redhat.com> + * network.py (NetworkDevice.__str__): Don't traceback with + unconfigured nics (#325071) + * upgrade.py (upgradeMountFilesystems): Check to see if we should disable selinux based on whether the system has been booting with selinux disabled (#242510) diff --git a/network.py b/network.py index 95604c9b0..4055788b6 100644 --- a/network.py +++ b/network.py @@ -132,7 +132,8 @@ class NetworkDevice(SimpleConfigFile): # Don't let onboot be turned on unless we have config information # to go along with it - if self.get('bootproto').lower() != 'dhcp' and not self.get('ipaddr'): + proto = self.get('bootproto') or "" + if proto.lower() != 'dhcp' and not self.get('ipaddr'): forceOffOnBoot = 1 else: forceOffOnBoot = 0 |