- add support for CTC protocol selection #132324, #132325

5 files changed, 8 insertions, 3 deletions

diff --git a/loader2/loader.c b/loader2/loader.c
index 0c22c4df6..f12e5d5cf 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -448,6 +448,9 @@ static void readNetInfo(int flags, struct loaderData_s ** ld) {
            if (strstr(vname, "NETTYPE")) {
                loaderData->nettype = strdup(vparm);
            }
+           if (strstr(vname, "CTCPROT")) {
+               loaderData->ctcprot = strdup(vparm);
+           }
        }
    }
    fclose(f);
diff --git a/loader2/loader.h b/loader2/loader.h
index 20b8b8e4b..c4012c16e 100644
--- a/loader2/loader.h
+++ b/loader2/loader.h
@@ -87,7 +87,7 @@ struct loaderData_s {
     int netDev_set;
     char * netCls;
     int netCls_set;
-    char * ip, *netmask, *gateway, *dns, *hostname, *peerid, *ethtool, *subchannels, *portname, *essid, *wepkey, *nettype;
+    char * ip, *netmask, *gateway, *dns, *hostname, *peerid, *ethtool, *subchannels, *portname, *essid, *wepkey, *nettype, *ctcprot;
     int mtu;
     int noDns;
     int ipinfo_set;
diff --git a/loader2/net.c b/loader2/net.c
index 17604aa68..b89ad54a4 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -738,6 +738,8 @@ int writeNetInfo(const char * fn, struct networkDeviceConfig * dev) {
         fprintf(f, "PORTNAME=%s\n", dev->portname);
     if (dev->nettype)
         fprintf(f, "NETTYPE=%s\n", dev->nettype);
+    if (dev->ctcprot)
+        fprintf(f, "CTCPROT=%s\n", dev->ctcprot);
 
     if (dev->essid)
         fprintf(f, "ESSID=%s\n", dev->essid);
diff --git a/loader2/net.h b/loader2/net.h
index f0c1f877a..57cdd13b8 100644
--- a/loader2/net.h
+++ b/loader2/net.h
@@ -19,7 +19,7 @@ struct networkDeviceConfig {
 
     /* s390 settings */
     int mtu;
-    char *subchannels, *portname, *peerid, *nettype;
+    char *subchannels, *portname, *peerid, *nettype, *ctcprot;
 };
 
 int readNetConfig(char * device, struct networkDeviceConfig * dev, 
diff --git a/network.py b/network.py
index 0a8bbbb03..31a13d3b6 100644
--- a/network.py
+++ b/network.py
@@ -173,7 +173,7 @@ class Network:
                     info [netinf[0]] = string.strip(netinf[1])
             self.netdevices [info["DEVICE"]] = NetworkDevice(info["DEVICE"])
             for key in ("IPADDR", "NETMASK", "BOOTPROTO", "ONBOOT", "MTU",
-                        "NETTYPE", "SUBCHANNELS", "PORTNAME",
+                        "NETTYPE", "SUBCHANNELS", "PORTNAME", "CTCPROT",
                         "PEERID", "ESSID", "KEY"):
                 if info.has_key(key):
                     self.netdevices [info["DEVICE"]].set((key, info[key]))