summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Hopp <karsten@redhat.de>2004-11-03 13:44:12 +0000
committerKarsten Hopp <karsten@redhat.de>2004-11-03 13:44:12 +0000
commit3c7f104c276795be77aeb89355dcf71f9729e150 (patch)
treeda734455e9872d3718b95d26afad3de7c318f14c
parentfe1bd186e95380b4fd08838432749abcb312ce7f (diff)
downloadanaconda-3c7f104c276795be77aeb89355dcf71f9729e150.tar.gz
anaconda-3c7f104c276795be77aeb89355dcf71f9729e150.tar.xz
anaconda-3c7f104c276795be77aeb89355dcf71f9729e150.zip
- Check input for CTCPROT, remove ctc-tty from selection
-rw-r--r--ChangeLog5
-rw-r--r--loader2/linuxrc.s39030
2 files changed, 28 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ad37f70d..8ac4a66db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-03 Karsten Hopp <karsten@redhat.com>
+
+ * loader2/linuxrc.s390: Check input for CTCPROT, remove ctc-tty
+ from selection
+
2004-11-02 Jeremy Katz <katzj@redhat.com>
* rescue.py (runRescue): Fix traceback with going back in the
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390
index 741de2ceb..4e457ba2e 100644
--- a/loader2/linuxrc.s390
+++ b/loader2/linuxrc.s390
@@ -276,13 +276,29 @@ else # ctc0, iucv0
if [ -z "$MTU" ]; then
MTU="1500"
fi
- echo $"Select which protocol should be used for the CTC interface"
- echo $"0 for compatibility with p.e. VM TCP service machine (default)"
- echo $"1 for enhanced package checking for Linux peers"
- echo $"2 for CTC based tty connection with a Linux peer"
- echo $"3 for compatibility with OS/390 or z/OS peers"
- read CTCPROT
- [ "x$CTCPROT" = "x0" ] && unset CTCPROT
+ validprot=0
+ while [ "$validprot" = "0" ]; do
+ echo $"Select which protocol should be used for the CTC interface"
+ echo $"0 for compatibility with p.e. VM TCP service machine (default)"
+ echo $"1 for enhanced package checking for Linux peers"
+ echo $"3 for compatibility with OS/390 or z/OS peers"
+ read CTCPROT
+ case "x$CTCPROT" in
+ x|x0)
+ validprot=1
+ unset CTCPROT
+ ;;
+ x1|x3)
+ validprot=1
+ ;;
+ x2)
+ echo $"CTC tty's are not usable for this installation"
+ ;;
+ *)
+ echo $"Invalid selection"
+ ;;
+ esac
+ done
fi
if [ ":$NETTYPE" = ":iucv" ]; then
while [ -z "$PEERID" ]; do