summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-10-24 06:48:00 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-10-24 06:48:00 -1000
commitc3ee703f3556702f7a04ead31b031426d33b1abd (patch)
tree45b9cf4c8b3fe20761bf2bf6179b5c69496db283
parent1a95528990319ff78eade6861ca1b6dd44752272 (diff)
downloadanaconda-c3ee703f3556702f7a04ead31b031426d33b1abd.tar.gz
anaconda-c3ee703f3556702f7a04ead31b031426d33b1abd.tar.xz
anaconda-c3ee703f3556702f7a04ead31b031426d33b1abd.zip
Revert "Enable CCW devices used for installation (#253075)"
This reverts commit 8995fb04957c597bd86f95b543c92052181ca0a6. Decision made to bump this feature request to 5.4 as the current implementation is not complete and breaks installation to zFCP devices.
-rw-r--r--loader2/linuxrc.s39026
-rwxr-xr-xscripts/upd-instroot1
2 files changed, 1 insertions, 26 deletions
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390
index b657204d4..c75010d1d 100644
--- a/loader2/linuxrc.s390
+++ b/loader2/linuxrc.s390
@@ -157,15 +157,6 @@ setupdevice()
echo $"SUBCHANNELS or NETTYPE empty, cannot continue."
exit 1
fi
-
- if [ -r /proc/cio_ignore ]; then
- # enable subchannels
- for subchannel in ${SUBCHANNELS//,/ } ; do
- echo free $subchannel > /proc/cio_ignore
- /sbin/chccwdev -e $subchannel
- done
- fi
-
SYSDIR=${SUBCHANNELS//,*/} # get first subchannel. This is where the device can be brought online
sysecho /sys/bus/ccwgroup/drivers/${NETTYPE}/group "$SUBCHANNELS"
if [ -n "$PORTNAME" ]; then
@@ -585,25 +576,10 @@ if [ -z "$DASD" ]; then
read DASD
fi
if [ -n "$DASD" ]; then
- # enable DASD devices
- if [ -r /proc/cio_ignore ]; then
- for dev in ${DASD//,/ } ; do
- echo free $dev > /proc/cio_ignore
- /sbin/chccwdev -e $dev
- done
- fi
-
- echo "DASD=$DASD" > /tmp/dasd_ports
+ echo "DASD=$DASD" > /tmp/dasd_ports
fi
for i in ${!FCP_*}; do
- # enable FCP devices
- if [ -r /proc/cio_ignore ]; then
- dev="$(echo ${!i} | cut -d ' ' -f 1)"
- echo free $dev > /proc/cio_ignore
- /sbin/chccwdev -e $dev
- fi
-
echo "${!i}" >> /tmp/fcpconfig
done
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 9fa9606e5..ba3674011 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -541,7 +541,6 @@ usr/sbin/sshd
usr/sbin/glibc_post_upgrade
usr/sbin/in.telnetd
usr/sbin/xinetd
-sbin/chccwdev
sbin/cmsfslst
sbin/cmsfscat
sbin/busybox.anaconda