The linuxrc.s390 rewrite changed the behavior of RUNKS on RHEL-5. We've
done away with RUNKS on RHEL-6, but we still need to maintain existing
functionality on RHEL-5.
---
loader2/linuxrc.s390 | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390
index 5dec01d..e159738 100644
--- a/loader2/linuxrc.s390
+++ b/loader2/linuxrc.s390
@@ -140,7 +140,7 @@ function startinetd()
/sbin/xinetd -stayalive -reuse -pidfile /tmp/xinetd.pid
/sbin/sshd
- if [ -z "$RUNKS" ]; then
+ if [ -z "$RUNKS" -o "$RUNKS" = "0" ]; then
echo
echo $"Connect now to $IPADDR and login as user root to start the installation."
echo $"E.g. using: ssh -X root@$IPADDR"
@@ -898,7 +898,7 @@ function reenter_menu() {
function workflow_item_menu() {
local noredo=$1
# default is to continue if running kickstart to prevent interaction
- [ -n "$RUNKS" ] && return 0
+ [ "$RUNKS" = "1" ] && return 0
interaction_happened="yes"
while : ; do
unset redoitem
@@ -2856,7 +2856,8 @@ while : ; do
# (a possible optimization would be matching those parms to table entry)
# - dialog has not been restarted
[ -n "$reenter" \
- -o -z "$RUNKS" -a \( -z "$NETTYPE" -o -z "$SUBCHANNELS" \) ] && \
+ -a \( "$RUNKS" = "0" -o -z "$RUNKS" \) \
+ -a \( -z "$NETTYPE" -o -z "$SUBCHANNELS" \) ] && \
dialog_network_table
if isVM; then
echo $"* NOTE: To enter default or empty values press enter twice. *"
@@ -2870,7 +2871,7 @@ while : ; do
[ -n "$CHANDEV" ] && do_chandev
do_subchannels
if [ "$NETTYPE" = "qeth" ]; then
- [ -z "$reenter" -a -n "$RUNKS" -a -z "$PORTNAME" ] || \
+ [ -z "$reenter" -a "$RUNKS" = "1" -a -z "$PORTNAME" ] || \
[ -n "${cardtype//OSD_*/}" ] || do_portname
# See also https://bugzilla.redhat.com/show_bug.cgi?id=439461
#
@@ -2881,7 +2882,7 @@ while : ; do
# respected (or the user will be asked if it was wrong).
if [ -f /sys/devices/qeth/$SCH_R_DEVBUSID/portno ]; then
# driver support exists since RHEL5.2
- [ -z "$reenter" -a -n "$RUNKS" -a -z "$PORTNO" ] || \
+ [ -z "$reenter" -a "$RUNKS" = "1" -a -z "$PORTNO" ] || \
[ -n "${cardtype//OSD_*/}" ] || do_portno
fi
do_layer2
@@ -2902,10 +2903,10 @@ while : ; do
fi
fi
elif [ "$NETTYPE" = "ctc" ]; then
- [ -z "$reenter" -a -n "$RUNKS" -a -z "$CTCPROT" ] || do_ctcprot
+ [ -z "$reenter" -a "$RUNKS" = "1" -a -z "$CTCPROT" ] || do_ctcprot
set_device_online || workflow_item_menu noredo
elif [ "$NETTYPE" = "lcs" ]; then
- [ -n "$RUNKS" -a -z "$PORTNAME" ] && PORTNAME=0
+ [ "$RUNKS" = "1" -a -z "$PORTNAME" ] && PORTNAME=0
do_lcs_portno
set_device_online || workflow_item_menu noredo
fi
@@ -3140,11 +3141,7 @@ EOF
trap doreboot SIGUSR2
startinetd
-
- if [ -n "$RUNKS" ]; then
- /sbin/loader
- fi
-
+ /sbin/loader
doreboot
fi # testing
--
1.6.5.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
