diff options
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/linuxrc.s390 | 3 | ||||
| -rw-r--r-- | loader2/loader.c | 4 | ||||
| -rw-r--r-- | loader2/loader.h | 3 | ||||
| -rw-r--r-- | loader2/net.c | 8 | ||||
| -rw-r--r-- | loader2/net.h | 3 |
5 files changed, 10 insertions, 11 deletions
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390 index c11172f18..54d488b2f 100644 --- a/loader2/linuxrc.s390 +++ b/loader2/linuxrc.s390 @@ -191,7 +191,6 @@ if [ "$NETTYPE" != "iucv" ]; then # iucv is the only interface without ccw con read SUBCHANNELS done if [ "$NETTYPE" = "qeth" ]; then - QETH="yes" if [ -z "$PORTNAME" ]; then echo $"Portname of the OSA-Express feature in QDIO mode and z/VM Guest LAN" echo $"This parameter is optional with z/VM 4.4.0 or z/VM 4.3.0 with" @@ -399,7 +398,7 @@ HOSTNAME=$HOSTNAME MTU=$MTU SUBCHANNELS=$SUBCHANNELS EOF -[ "$QETH" != "" ] && echo "QETH=$QETH" >> /tmp/netinfo +[ "$NETTYPE" != "" ] && echo "NETTYPE=$NETTYPE" >> /tmp/netinfo [ "$PEERID" != "" ] && echo "PEERID=$PEERID" >> /tmp/netinfo [ "$PORTNAME" != "" ] && echo "PORTNAME=$PORTNAME" >> /tmp/netinfo diff --git a/loader2/loader.c b/loader2/loader.c index 5320fafeb..0c22c4df6 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -445,8 +445,8 @@ static void readNetInfo(int flags, struct loaderData_s ** ld) { if (strstr(vname, "PORTNAME")) { loaderData->portname = strdup(vparm); } - if (strstr(vname, "QETH")) { - loaderData->is_qeth = 1; + if (strstr(vname, "NETTYPE")) { + loaderData->nettype = strdup(vparm); } } } diff --git a/loader2/loader.h b/loader2/loader.h index 91bc49ab5..20b8b8e4b 100644 --- a/loader2/loader.h +++ b/loader2/loader.h @@ -87,9 +87,8 @@ struct loaderData_s { int netDev_set; char * netCls; int netCls_set; - char * ip, *netmask, *gateway, *dns, *hostname, *peerid, *ethtool, *subchannels, *portname, *essid, *wepkey; + char * ip, *netmask, *gateway, *dns, *hostname, *peerid, *ethtool, *subchannels, *portname, *essid, *wepkey, *nettype; int mtu; - int is_qeth; int noDns; int ipinfo_set; char * ksFile; diff --git a/loader2/net.c b/loader2/net.c index 2d27527e8..17604aa68 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -381,7 +381,9 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, cfg->portname = strdup(loaderData->portname); } - cfg->is_qeth = loaderData->is_qeth; + if (loaderData->nettype) { + cfg->nettype = strdup(loaderData->nettype); + } if (loaderData->ethtool) { char * option, * buf; @@ -734,8 +736,8 @@ int writeNetInfo(const char * fn, struct networkDeviceConfig * dev) { fprintf(f, "SUBCHANNELS=%s\n", dev->subchannels); if (dev->portname) fprintf(f, "PORTNAME=%s\n", dev->portname); - if (dev->is_qeth) - fprintf(f, "QETH=yes\n"); + if (dev->nettype) + fprintf(f, "NETTYPE=%s\n", dev->nettype); if (dev->essid) fprintf(f, "ESSID=%s\n", dev->essid); diff --git a/loader2/net.h b/loader2/net.h index d1b0098e6..f0c1f877a 100644 --- a/loader2/net.h +++ b/loader2/net.h @@ -19,8 +19,7 @@ struct networkDeviceConfig { /* s390 settings */ int mtu; - int is_qeth; - char *subchannels, *portname, *peerid; + char *subchannels, *portname, *peerid, *nettype; }; int readNetConfig(char * device, struct networkDeviceConfig * dev, |