diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-31 00:14:56 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-31 00:14:56 +0000 |
| commit | 831930c4aaa63d029d48573b33a7c98586ede6ba (patch) | |
| tree | 19437293bb2948338f9be020f43690c1afa780a9 /loader2 | |
| parent | b1d546977dbe8a2b7cb059ef834f186f19a2311f (diff) | |
| download | anaconda-831930c4aaa63d029d48573b33a7c98586ede6ba.tar.gz anaconda-831930c4aaa63d029d48573b33a7c98586ede6ba.tar.xz anaconda-831930c4aaa63d029d48573b33a7c98586ede6ba.zip | |
merge from taroon branch to head
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/linuxrc.s390 | 12 | ||||
| -rw-r--r-- | loader2/net.c | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390 index 3e0b01891..d063e1d6a 100644 --- a/loader2/linuxrc.s390 +++ b/loader2/linuxrc.s390 @@ -120,10 +120,12 @@ if [ ":$NETTYPE" != ":iucv" ]; then # iucv is the only interface without chand while [ -z "$CHANDEV" ]; do echo $"Enter parameters you need to pass to the channel device layer." echo $"This includes the I/O ports of your ctc, escon, qeth, hsi and lcs devices." + echo $"(e.g. \"ctc0,0x600,0x601\" will activate the ctc0 interface at I/O" + echo $"ports 0x600,0x601)" + echo $"Hipersocket interfaces need to be configured like qeth devices," + echo $"p.e. qeth0,0x3000,0x3001,0x3002" echo $"Additional parameters for QETH devices such as the portname" echo $"should be entered at the next prompt, not here !" - echo $"(e.g. \"ctc0,0x600,0x601\" will activate the ctc0 interface at I/O" - echo $"ports 0x600,0x601):" read CHANDEV done echo "$CHANDEV" |grep -q "qeth" @@ -160,7 +162,7 @@ while [ -z "$NETWORK" ]; do echo $"Enter the network address of the new Linux guest:" read NETWORK done -if [ ":$NETTYPE" = ":eth" ] || [ ":$NETTYPE" = ":tr" ] || [ ":$NETTYPE" = ":hsi" ]; then +if [ ":$NETTYPE" = ":eth" ] || [ ":$NETTYPE" = ":tr" ] || [ ":$NETTYPE" = ":hsi" ] || [ ":$NETTYPE" = ":lcs" ]; then while [ -z "$NETMASK" ]; do echo $"Enter the netmask for the new Linux guest (e.g. 255.255.255.0):" read NETMASK @@ -239,6 +241,7 @@ elif [ -n "$LCS" -o -n "$TR" ]; then insmod lcs$LO ifconfig $DEVICE $IPADDR $MMTU netmask $NETMASK broadcast $BROADCAST route add -net $NETWORK netmask $NETMASK dev $DEVICE 2>/dev/null + echo "alias $DEVICE lcs" >> /tmp/modules.conf elif [ -n "$QETH" -o -n "$HSI" ]; then if [ "$DEVICE" = "eth0" -a "$HSI" = "on" ]; then DEVICE="hsi0" @@ -247,6 +250,7 @@ elif [ -n "$QETH" -o -n "$HSI" ]; then insmod qeth$LO ifconfig $DEVICE $IPADDR $MMTU netmask $NETMASK broadcast $BROADCAST route add -net $NETWORK netmask $NETMASK dev $DEVICE 2>/dev/null + echo "alias $DEVICE qeth" >> /tmp/modules.conf else echo $"Unknown network device, aborting installation" exit 1 @@ -358,7 +362,7 @@ export LD_LIBRARY_PATH PATH HOME PYTHONPATH EOF -if [ "$NETTYPE" = "ctc" ]; then +if [ "$NETTYPE" = "ctc" -o "$NETTYPE" = "escon" -o "$NETTYPE" = "iucv" ]; then echo "REMIP=$GATEWAY" >> /tmp/netinfo echo "export REMIP=$GATEWAY" >> /etc/profile fi diff --git a/loader2/net.c b/loader2/net.c index 49a3b0b61..57891ee6c 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -895,6 +895,10 @@ int kickstartNetworkUp(struct knownDevices * kd, break; } while (1); + /* we don't want to end up asking about interface more than once + * if we're in a kickstart-ish case (#100724) */ + loaderData->netDev_set = 1; + /* JKFIXME: this is kind of crufty, we depend on the fact that the * ip is set and then just get the network up. we should probably * add a way to do asking about static here and not be such a hack */ |