Attachment 152002 Details for Bug 233376 – Full support for layer2/layer3

[patch] Full support for layer2/layer3

anaconda-11.1.2.36-s390-layer2.patch (text/plain), 4.02 KB, created by Brad Hinson on 2007-04-09 17:00:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Hinson

Created: 2007-04-09 17:00:36 UTC

Size: 4.02 KB

patch

obsolete

>--- anaconda-11.1.2.36/loader2/loader.h.orig
>+++ anaconda-11.1.2.36/loader2/loader.h
>@@ -99,7 +99,7 @@
>     int bootIf_set;
>     char * netCls;
>     int netCls_set;
>-    char *ip, *ipv6, *netmask, *gateway, *dns, *hostname, *peerid, *ethtool, *subchannels, *portname, *essid, *wepkey, *nettype, *ctcprot;
>+    char *ip, *ipv6, *netmask, *gateway, *dns, *hostname, *peerid, *ethtool, *subchannels, *portname, *essid, *wepkey, *nettype, *ctcprot, *layer2;
>     int mtu;
>     int noDns;
>     int ipinfo_set;
>
>--- anaconda-11.1.2.36/loader2/loader.c.orig
>+++ anaconda-11.1.2.36/loader2/loader.c
>@@ -494,6 +494,9 @@
> 
>             if (!strncmp(vname, "CTCPROT", 7))
>                 loaderData->ctcprot = strdup(vparm);
>+
>+            if (!strncmp(vname, "LAYER2", 6))
>+                loaderData->layer2 = strdup(vparm);
>         }
>     }
> 
>--- anaconda-11.1.2.36/loader2/net.h.orig
>+++ anaconda-11.1.2.36/loader2/net.h
>@@ -35,7 +35,7 @@
> 
>     /* s390 settings */
>     int mtu;
>-    char *subchannels, *portname, *peerid, *nettype, *ctcprot;
>+    char *subchannels, *portname, *peerid, *nettype, *ctcprot, *layer2;
> };
> 
> struct intfconfig_s {
>
>--- anaconda-11.1.2.36/loader2/net.c.orig
>+++ anaconda-11.1.2.36/loader2/net.c
>@@ -525,6 +525,10 @@
>         parseEthtoolSettings(loaderData);
>     }
> 
>+    if (loaderData->layer2) {
>+        cfg->layer2 = strdup(loaderData->layer2);
>+    }
>+
>     cfg->noipv4 = loaderData->noipv4;
>     cfg->noipv6 = loaderData->noipv6;
>     cfg->noDns = loaderData->noDns;
>@@ -1417,6 +1421,10 @@
>         fprintf(f, "NETTYPE=%s\n", dev->nettype);
>     if (dev->ctcprot)
>         fprintf(f, "CTCPROT=%s\n", dev->ctcprot);
>+    if (dev->layer2 && !strcmp(dev->layer2, "1"))
>+        fprintf(f, "OPTIONS=\"layer2=1\"\n");
>+    else if (dev->subchannels)
>+	fprintf(f, "ARP=no\n");
> 
>     if (dev->essid)
>         fprintf(f, "ESSID=%s\n", dev->essid);
>
>--- anaconda-11.1.2.36/loader2/linuxrc.s390.orig
>+++ anaconda-11.1.2.36/loader2/linuxrc.s390
>@@ -139,6 +139,9 @@
>    if [ -n "$CTCPROT" -a "$NETTYPE" = "ctc" ]; then
>       sysecho /sys/bus/ccwgroup/drivers/ctc/${SYSDIR}/protocol "$CTCPROT"
>    fi
>+   if [ -n "$LAYER2" -a "$NETTYPE" = "qeth" ]; then
>+      sysecho /sys/bus/ccwgroup/drivers/qeth/${SYSDIR}/layer2 "$LAYER2"
>+   fi
>    sysecho /sys/bus/ccwgroup/drivers/${NETTYPE}/${SYSDIR}/online 1
> }
> 
>@@ -254,6 +257,12 @@
> 			echo $"Press enter if you don't want to enter a portname"
> 			read PORTNAME
> 		fi
>+		if [ -z "$LAYER2" ]; then
>+			echo $"Enter the mode of operation for the OSA device"
>+			echo $"0 for layer 3 mode (default)"
>+			echo $"1 for layer 2 mode"
>+			read LAYER2
>+		fi
>    fi
> fi
>       
>@@ -497,6 +506,7 @@
> [ "$PEERID" != "" ] && echo "PEERID=$PEERID" >> /tmp/netinfo
> [ "$PORTNAME" != "" ] && echo "PORTNAME=$PORTNAME" >> /tmp/netinfo
> [ "$CTCPROT" != "" ] && echo "CTCPROT=$CTCPROT" >> /tmp/netinfo
>+[ "$LAYER2" != "" ] && echo "LAYER2=$LAYER2" >> /tmp/netinfo
> 
> # so that the vars get propagated into the sshd shells
> mkdir /.ssh
>
>--- anaconda-11.1.2.36/network.py.orig
>+++ anaconda-11.1.2.36/network.py
>@@ -195,13 +195,16 @@
> 	    self.isConfigured = 1
>             for line in lines:
>                 netinf = string.splitfields(line, '=')
>-                if len(netinf) >= 2:
>+                if len(netinf) >= 3:
>+                    info [netinf[0]] = string.strip(netinf[1]) + "=" + string.strip(netinf[2])
>+                elif len(netinf) >= 2:
>                     info [netinf[0]] = string.strip(netinf[1])
>             self.netdevices [info["DEVICE"]] = NetworkDevice(info["DEVICE"])
>             self.firstnetdevice = info["DEVICE"]
>             for key in ("IPADDR", "NETMASK", "BOOTPROTO", "ONBOOT", "MTU",
>                         "NETTYPE", "SUBCHANNELS", "PORTNAME", "CTCPROT",
>-                        "PEERID", "ESSID", "KEY", "IPV6ADDR", "IPV6_AUTOCONF"):
>+                        "PEERID", "ESSID", "KEY", "IPV6ADDR", "IPV6_AUTOCONF",
>+                        "OPTIONS", "ARP"):
>                 if info.has_key(key):
>                     self.netdevices [info["DEVICE"]].set((key, info[key]))
>             if info.has_key("GATEWAY"):

Actions: View | Diff

Attachments on bug 233376: 150630 | 150706 | 151218 | 152002 | 152004