diff options
| author | Karsten Hopp <karsten@redhat.de> | 2004-08-25 15:44:54 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@redhat.de> | 2004-08-25 15:44:54 +0000 |
| commit | 48b2ec06ef0896964b6c9154fd6003597a8c7fbf (patch) | |
| tree | e19e55945cc6e96fb68fcfe6b03842be33184e99 | |
| parent | ee77744031becc04c97efdf8c0c0c3e912af6ce6 (diff) | |
| download | anaconda-48b2ec06ef0896964b6c9154fd6003597a8c7fbf.tar.gz anaconda-48b2ec06ef0896964b6c9154fd6003597a8c7fbf.tar.xz anaconda-48b2ec06ef0896964b6c9154fd6003597a8c7fbf.zip | |
- rip out CHANDEV parsing stuff, it's to error prone (129167)
| -rw-r--r-- | loader2/linuxrc.s390 | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390 index b2be04dbc..c68b7b308 100644 --- a/loader2/linuxrc.s390 +++ b/loader2/linuxrc.s390 @@ -107,28 +107,6 @@ setupdevice() sysecho /sys/bus/ccwgroup/drivers/${DIRNAME}/${SYSDIR}/online 1 } -convertchandev() -{ - local del dev channels - if [ -z "$CHANDEV" -o -n "$SUBCHANNELS" ]; then - return - fi - dev=${CHANDEV//,*/} - channels=${CHANDEV#${dev},*} - channels=${channels//0x/0} - SUBCHANNELS="0.0.${channels//,*/}" - channels="${channels#*,}" - SUBCHANNELS="$SUBCHANNELS,0.0.${channels//,*/}" - if [ "$NETTYPE" = "eth" -o "$NETTYPE" = "hsi" ]; then - channels="${channels#*,}" - SUBCHANNELS="$SUBCHANNELS,0.0.${channels//,*/}" - fi - [ -z "$QETHPARM" ] && return - del=${QETHPARM%%portname:*} - PORTNAME=${QETHPARM#${del}} - PORTNAME=${PORTNAME//,*/} -} - S390ARCH=`uname -m` if [ "$S390ARCH" = "s390" ]; then export S390ARCH="S/390" @@ -192,7 +170,12 @@ while [ -z "$NETTYPE" ]; do done DEVICE=${NETTYPE}0 if [ "$NETTYPE" != "iucv" ]; then # iucv is the only interface without ccw config - convertchandev + if [ -n "$CHANDEV" ]; then + echo + echo $"The CHANDEV variable isn't used anymore, please update your " + echo $".parm or the .conf file" + echo + fi while [ -z "$SUBCHANNELS" ]; do echo $"Enter the bus ID and the device number of your CCW devices." echo $"CTC, ESCON and LCS need two subchannels:" |