First patch removes the bootdisk/s390 subdirectory since we only build for s390x in RHEL-land now. No need for this directory.
The second patch removes the cio_ignore functionality brought over from rhel5-branch. This has been reverted on rhel5, so I want to keep rawhide in sync.
Don't need an s390 arch subdir, just s390x. --- bootdisk/s390/generic.ins | 4 ---- bootdisk/s390/generic.prm | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) delete mode 100644 bootdisk/s390/generic.ins delete mode 100644 bootdisk/s390/generic.prm
diff --git a/bootdisk/s390/generic.ins b/bootdisk/s390/generic.ins deleted file mode 100644 index 9dcbbe4..0000000 --- a/bootdisk/s390/generic.ins +++ /dev/null @@ -1,4 +0,0 @@ -* minimal lpar ins file -images/kernel.img 0x00000000 -images/initrd.img 0x00800000 -images/generic.prm 0x00010480 diff --git a/bootdisk/s390/generic.prm b/bootdisk/s390/generic.prm deleted file mode 100644 index e953ce2..0000000 --- a/bootdisk/s390/generic.prm +++ /dev/null @@ -1 +0,0 @@ -root=/dev/ram0 ro ip=off ramdisk_size=40000 cio_ignore=all,!0.0.0009
Hi,
Also looks good to me.
Regards,
Hans
David Cantrell wrote:
Don't need an s390 arch subdir, just s390x.
bootdisk/s390/generic.ins | 4 ---- bootdisk/s390/generic.prm | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) delete mode 100644 bootdisk/s390/generic.ins delete mode 100644 bootdisk/s390/generic.prm
diff --git a/bootdisk/s390/generic.ins b/bootdisk/s390/generic.ins deleted file mode 100644 index 9dcbbe4..0000000 --- a/bootdisk/s390/generic.ins +++ /dev/null @@ -1,4 +0,0 @@ -* minimal lpar ins file -images/kernel.img 0x00000000 -images/initrd.img 0x00800000 -images/generic.prm 0x00010480 diff --git a/bootdisk/s390/generic.prm b/bootdisk/s390/generic.prm deleted file mode 100644 index e953ce2..0000000 --- a/bootdisk/s390/generic.prm +++ /dev/null @@ -1 +0,0 @@ -root=/dev/ram0 ro ip=off ramdisk_size=40000 cio_ignore=all,!0.0.0009
We've backed this out on RHEL 5.3 for now because it was far more complex than IBM had told us, so it's back to the drawing board for this one. Keeping rawhide in sync with what's happening on the RHEL side with this feature. --- bootdisk/s390x/generic.prm | 2 +- loader/linuxrc.s390 | 24 ------------------------ scripts/upd-instroot | 1 - 3 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/bootdisk/s390x/generic.prm b/bootdisk/s390x/generic.prm index e953ce2..e468761 100644 --- a/bootdisk/s390x/generic.prm +++ b/bootdisk/s390x/generic.prm @@ -1 +1 @@ -root=/dev/ram0 ro ip=off ramdisk_size=40000 cio_ignore=all,!0.0.0009 +root=/dev/ram0 ro ip=off ramdisk_size=40000 diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index 90c739f..08d5755 100644 --- a/loader/linuxrc.s390 +++ b/loader/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 @@ -575,25 +566,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 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 8e43ac3..250ed08 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -631,7 +631,6 @@ usr/bin/ldd usr/sbin/chroot usr/sbin/sshd usr/sbin/glibc_post_upgrade -sbin/chccwdev sbin/cmsfslst sbin/cmsfscat sbin/busybox.anaconda
Hi,
Looks good to me.
Regards,
Hans
David Cantrell wrote:
We've backed this out on RHEL 5.3 for now because it was far more complex than IBM had told us, so it's back to the drawing board for this one. Keeping rawhide in sync with what's happening on the RHEL side with this feature.
bootdisk/s390x/generic.prm | 2 +- loader/linuxrc.s390 | 24 ------------------------ scripts/upd-instroot | 1 - 3 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/bootdisk/s390x/generic.prm b/bootdisk/s390x/generic.prm index e953ce2..e468761 100644 --- a/bootdisk/s390x/generic.prm +++ b/bootdisk/s390x/generic.prm @@ -1 +1 @@ -root=/dev/ram0 ro ip=off ramdisk_size=40000 cio_ignore=all,!0.0.0009 +root=/dev/ram0 ro ip=off ramdisk_size=40000 diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index 90c739f..08d5755 100644 --- a/loader/linuxrc.s390 +++ b/loader/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
@@ -575,25 +566,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
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 8e43ac3..250ed08 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -631,7 +631,6 @@ usr/bin/ldd usr/sbin/chroot usr/sbin/sshd usr/sbin/glibc_post_upgrade -sbin/chccwdev sbin/cmsfslst sbin/cmsfscat sbin/busybox.anaconda
anaconda-devel@lists.stg.fedoraproject.org