diff options
| -rw-r--r-- | loader2/linuxrc.s390 | 6 | ||||
| -rw-r--r-- | loader2/loader.c | 4 | ||||
| -rw-r--r-- | loader2/loader.h | 2 | ||||
| -rw-r--r-- | loader2/net.c | 8 | ||||
| -rw-r--r-- | loader2/net.h | 3 |
5 files changed, 8 insertions, 15 deletions
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390 index cc13f8d7a..7f4ca3eba 100644 --- a/loader2/linuxrc.s390 +++ b/loader2/linuxrc.s390 @@ -415,12 +415,6 @@ if [ -n "$DISPLAY" ]; then echo "export DISPLAY=$DISPLAY" >> /etc/profile fi - -if [ "$NETTYPE" = "ctc" -o "$NETTYPE" = "escon" -o "$NETTYPE" = "iucv" ]; then - echo "REMIP=$GATEWAY" >> /tmp/netinfo - echo "export REMIP=$GATEWAY" >> /etc/profile -fi - # I'm tired of typing this out... echo "loader" >> /.bash_history diff --git a/loader2/loader.c b/loader2/loader.c index ce9c2600c..5320fafeb 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -436,8 +436,8 @@ static void readNetInfo(int flags, struct loaderData_s ** ld) { if (strstr(vname, "MTU")) { loaderData->mtu = atoi(vparm); } - if (strstr(vname, "REMIP")) { - loaderData->ptpaddr = strdup(vparm); + if (strstr(vname, "PEERID")) { + loaderData->peerid = strdup(vparm); } if (strstr(vname, "SUBCHANNELS")) { loaderData->subchannels = strdup(vparm); diff --git a/loader2/loader.h b/loader2/loader.h index ddf66033f..91bc49ab5 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, *ptpaddr, *ethtool, *subchannels, *portname, *essid, *wepkey; + char * ip, *netmask, *gateway, *dns, *hostname, *peerid, *ethtool, *subchannels, *portname, *essid, *wepkey; int mtu; int is_qeth; int noDns; diff --git a/loader2/net.c b/loader2/net.c index c63a83285..2d27527e8 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -369,8 +369,8 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, cfg->mtu = loaderData->mtu; } - if (loaderData->ptpaddr && (inet_aton(loaderData->ptpaddr, &addr))) { - cfg->ptpaddr = addr; + if (loaderData->peerid) { + cfg->peerid = strdup(loaderData->peerid); } if (loaderData->subchannels) { @@ -728,8 +728,8 @@ int writeNetInfo(const char * fn, struct networkDeviceConfig * dev) { fprintf(f, "DOMAIN=%s\n", dev->dev.domain); if (dev->mtu) fprintf(f, "MTU=%d\n", dev->mtu); - if (dev->ptpaddr.s_addr) - fprintf(f, "REMIP=%s\n", inet_ntoa(dev->ptpaddr)); + if (dev->peerid) + fprintf(f, "PEERID=%s\n", dev->peerid); if (dev->subchannels) fprintf(f, "SUBCHANNELS=%s\n", dev->subchannels); if (dev->portname) diff --git a/loader2/net.h b/loader2/net.h index 5a1f231c6..d1b0098e6 100644 --- a/loader2/net.h +++ b/loader2/net.h @@ -20,8 +20,7 @@ struct networkDeviceConfig { /* s390 settings */ int mtu; int is_qeth; - struct in_addr ptpaddr; - char *subchannels, *portname; + char *subchannels, *portname, *peerid; }; int readNetConfig(char * device, struct networkDeviceConfig * dev, |