diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-08-27 20:33:37 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-08-27 20:33:37 +0000 |
| commit | 7b7b11935b430f32be38061b2c3506b4499895ff (patch) | |
| tree | 247b00ff2c2f4b2e9d0c890701b03b98fc6a1746 /loader2 | |
| parent | 4af8b5ec3a3b217b458e77a7ed60d63c0e53b0ec (diff) | |
| download | anaconda-7b7b11935b430f32be38061b2c3506b4499895ff.tar.gz anaconda-7b7b11935b430f32be38061b2c3506b4499895ff.tar.xz anaconda-7b7b11935b430f32be38061b2c3506b4499895ff.zip | |
merge from taroon branch
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/hardware.c | 4 | ||||
| -rw-r--r-- | loader2/linuxrc.s390 | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/loader2/hardware.c b/loader2/hardware.c index 633baf346..4d0e8f68c 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -297,8 +297,8 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps, if(fd) { line = (char *)malloc(sizeof(char) * 200); while (fgets (line, 199, fd) != NULL) { - if((parms = strstr(line, " dasd=")) || - (parms = strstr(line, " DASD="))) { + if((parms = strstr(line, "dasd=")) || + (parms = strstr(line, "DASD="))) { parms++; strncpy(parms, "dasd", 4); parms_end = parms; diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390 index 849eb211c..65f0d38e7 100644 --- a/loader2/linuxrc.s390 +++ b/loader2/linuxrc.s390 @@ -229,13 +229,11 @@ if [ ":$NETTYPE" = ":ctc" -o ":$NETTYPE" = ":escon" ]; then insmod fsm$LO insmod ctc$LO ifconfig $DEVICE $IPADDR $MMTU pointopoint $GATEWAY - route add -host $IPADDR dev $DEVICE 2>/dev/null elif [ ":$NETTYPE" = ":iucv" ]; then insmod fsm$LO insmod iucv$LO insmod netiucv$LO $IUCV ifconfig $DEVICE $IPADDR $MMTU pointopoint $GATEWAY - route add -host $IPADDR dev $DEVICE 2>/dev/null if [ -n "$IUCV" ]; then echo "options netiucv $IUCV" >> /tmp/modules.conf fi |