[rhel5-branch] write OPTIONS for s390x netdevs on all methods

[David Cantrell]

This platform again.

[PATCH] Write OPTIONS for s390x net devs on non-network install methods (#649301)

[David Cantrell]

Make sure the LAYER2 and PORTNO values collected by linuxrc.s390 are
translated to an appropriate OPTIONS line for the ifcfg-DEVICE file on
the target system.  This happens during network install methods because
loader converts those values in to an OPTIONS line, but if you use the
hard drive install method, the values are never translated to OPTIONS.
Do the translation in network.py to ensure we get those values on all
install methods.
---
 network.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/network.py b/network.py
index 84776e4..2e518b4 100644
--- a/network.py
+++ b/network.py
@@ -216,6 +216,14 @@ class Network:
                 if info.has_key(key):
                     self.netdevices [info["DEVICE"]].set((key, info[key]))

+            osa_opts = []
+            for key in ("LAYER2", "PORTNO"):
+                if info.has_key(key) and info[key] == "1":
+                    osa_opts.append(key.lower() + "=" + info[key])
+
+            if osa_opts:
+                self.netdevices[info["DEVICE"]].set(("OPTIONS", " ".join(osa_opts)))
+
             self.netdevices [info["DEVICE"]].set(('useIPv4', flags.useIPv4))
             self.netdevices [info["DEVICE"]].set(('useIPv6', flags.useIPv6))

[PATCH] Write OPTIONS for s390x net devs on non-network install methods (#649301)

[Brian C. Lane]

On Wed, Mar 30, 2011 at 10:42:18AM -1000, David Cantrell wrote:
> Make sure the LAYER2 and PORTNO values collected by linuxrc.s390 are
> translated to an appropriate OPTIONS line for the ifcfg-DEVICE file on
> the target system.  This happens during network install methods because
> loader converts those values in to an OPTIONS line, but if you use the
> hard drive install method, the values are never translated to OPTIONS.
> Do the translation in network.py to ensure we get those values on all
> install methods.

Ack.