diff options
| author | Steffen Maier <maier@linux.vnet.ibm.com> | 2009-10-05 00:10:59 +0200 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-10-15 11:07:23 -1000 |
| commit | 8549a36d4b22171992951a272b82f0aa14234dc4 (patch) | |
| tree | 72e3e71f596971d479d76816bc4c11e4bd6440e8 /network.py | |
| parent | 50befe6e3833568d82e25d9589037db00e6c1437 (diff) | |
| download | anaconda-8549a36d4b22171992951a272b82f0aa14234dc4.tar.gz anaconda-8549a36d4b22171992951a272b82f0aa14234dc4.tar.xz anaconda-8549a36d4b22171992951a272b82f0aa14234dc4.zip | |
Write LAYER2 and PORTNO correctly as parts of OPTIONS to ifcfg for s390x
On s390x, linuxrc.s390 brings up the network completely and
writes an NM compliant /etc/sysconfig/network-scripts/ifcfg-<DEVICE>.
Apparently, loader never hits STEP_IP or writeEnabledNetworkInfo().
The latter would convert LAYER2= and PORTNO= into OPTIONS="".
Since it does not seem to be called, linuxrc.s390 now writes OPTIONS="".
Fixed readIfcfgContents() to not swallow OPTIONS which contains '='.
With this in place, network.py writes a correct ifcfg to /mnt/sysimage.
This patch completes ifcfg production on s390x of the following commits:
25f58fe7c701c453d39d2a9c5c0850eefce07f76
9249e40f42ffbbdcf42cd1caad72e3d622c7a75b
5f0fcf6688d08f83826c2892bb9fc97d6b4d7dd0
81163960a6137d39a5f2082e9f8d9f0a7b2ada57
This patch is intended for both devel and F-12.
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/network.py b/network.py index 3b0dacfa6..d8cbedfff 100644 --- a/network.py +++ b/network.py @@ -366,7 +366,7 @@ class Network: if line.startswith('#') or line == '': continue - var = string.splitfields(line, '=') + var = string.splitfields(line, '=', 1) if len(var) == 2: var[1] = var[1].replace('"', '') contents[var[0]] = string.strip(var[1]) |