diff options
| -rw-r--r-- | initscripts-s390.patch | 54 | ||||
| -rw-r--r-- | initscripts.spec | 4 | ||||
| -rwxr-xr-x | src/mkkerneldoth.s390 | 33 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ctc | 14 |
4 files changed, 80 insertions, 25 deletions
diff --git a/initscripts-s390.patch b/initscripts-s390.patch index 08c503ab..5c0b375d 100644 --- a/initscripts-s390.patch +++ b/initscripts-s390.patch @@ -1,6 +1,6 @@ ---- initscripts-5.97/rc.d/init.d/halt.s390init Thu Jul 5 17:55:32 2001 -+++ initscripts-5.97/rc.d/init.d/halt Thu Jul 5 17:54:42 2001 -@@ -110,7 +110,9 @@ +--- initscripts-6.14/rc.d/init.d/halt.s390init Tue Aug 7 09:04:12 2001 ++++ initscripts-6.14/rc.d/init.d/halt Mon Aug 13 17:49:05 2001 +@@ -115,7 +115,9 @@ ;; esac @@ -11,8 +11,8 @@ # Turn off swap, then unmount file systems. SWAPS=`awk '! /^Filename/ { print $1 }' /proc/swaps` ---- initscripts-5.97/rc.d/rc.sysinit.s390init Thu Jun 21 19:06:53 2001 -+++ initscripts-5.97/rc.d/rc.sysinit Thu Jul 5 17:55:07 2001 +--- initscripts-6.14/rc.d/rc.sysinit.s390init Thu Aug 9 00:03:09 2001 ++++ initscripts-6.14/rc.d/rc.sysinit Mon Aug 13 17:51:55 2001 @@ -105,9 +105,13 @@ ;; esac @@ -30,7 +30,7 @@ if [ "`/sbin/consoletype`" = "vt" ]; then # Load keymap -@@ -269,6 +273,9 @@ +@@ -290,6 +294,9 @@ else action $"Skipping ISA PNP configuration at users request: " /bin/true fi @@ -40,7 +40,7 @@ fi # Remount the root filesystem read-write. -@@ -276,6 +283,24 @@ +@@ -297,6 +304,24 @@ [ "$state" != "rw" ] && \ action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw / @@ -64,26 +64,46 @@ + # LVM initialization if [ -e /proc/lvm -a -x /sbin/vgchange -a -f /etc/lvmtab ]; then - action $"Setting up LVM:" /sbin/vgscan && /sbin/vgchange -a y -@@ -576,21 +601,6 @@ - if [ -x /usr/bin/passwd ]; then - /usr/bin/passwd root + action $"Setting up Logical Volume Management:" /sbin/vgscan && /sbin/vgchange -a y +@@ -573,23 +598,29 @@ + + # Configure machine if necessary. + if [ -f /.unconfigured ]; then +- if [ -x /usr/bin/passwd ]; then +- /usr/bin/passwd root ++ # on S390 console we don't have newt ++ if [ "`/bin/arch`" = "s390" ] ; then ++ ARCH=".s390" ++ else ++ ARCH="" ++ fi ++ if [ -x /usr/bin/passwd$ARCH ]; then ++ /usr/bin/passwd$ARCH root fi - if [ -x /usr/sbin/netconfig ]; then - /usr/sbin/netconfig -- fi ++ if [ -x /usr/sbin/netconfig$ARCH ]; then ++ /usr/sbin/netconfig$ARCH + fi - if [ -x /usr/sbin/timeconfig ]; then - /usr/sbin/timeconfig -- fi ++ if [ -x /usr/sbin/timeconfig$ARCH ]; then ++ /usr/sbin/timeconfig$ARCH + fi - if [ -x /usr/sbin/kbdconfig ]; then - /usr/sbin/kbdconfig -- fi ++ if [ -x /usr/sbin/kbdconfig$ARCH ]; then ++ /usr/sbin/kbdconfig$ARCH + fi - if [ -x /usr/sbin/authconfig ]; then - /usr/sbin/authconfig --nostart -- fi ++ if [ -x /usr/sbin/authconfig$ARCH ]; then ++ /usr/sbin/authconfig$ARCH --nostart + fi - if [ -x /usr/sbin/ntsysv ]; then - /usr/sbin/ntsysv --level 35 -- fi ++ if [ -x /usr/sbin/ntsysv$ARCH ]; then ++ /usr/sbin/ntsysv$ARCH --level 35 + fi # Reread in network configuration data. - if [ -f /etc/sysconfig/network ]; then diff --git a/initscripts.spec b/initscripts.spec index 08bfa17d..670b16cb 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -238,6 +238,10 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/locale/*/LC_MESSAGES %changelog +* Wed Aug 15 2001 Bernhard Rosenkraenzer <bero@redhat.com> +- adjust s390 patch +- fix up ifup-ctc and mkkerneldoth.s390 (both are s390 specific) + * Mon Aug 13 2001 Yukihiro Nakai <ynakai@redhat.com> - don't display Chinese Korean if we aren't on a pty diff --git a/src/mkkerneldoth.s390 b/src/mkkerneldoth.s390 index 137c15ec..d6629d95 100755 --- a/src/mkkerneldoth.s390 +++ b/src/mkkerneldoth.s390 @@ -3,19 +3,38 @@ # Generate a header that defines the boot kernel. # -KVER=`uname -r | sed 's/[^a-zA-Z]//g'` +KERNEL_TYPE=`uname -r | sed 's_^.*\(tape\)$_-\1_;t;s_.*__;'` +KERNEL_RELEASE=`uname -r | sed 's|tape||g'` -cat > /boot/kernel.h << EOF -/* This file is automatically generated at boot time. */ +rpm -q kernel$KERNEL_TYPE-$KERNEL_RELEASE >/dev/null 2>&1 && KERNEL_ARCH=`rpm -q --qf '%{ARCH}' kernel$KERNEL_TYPE-$KERNEL_RELEASE 2>/dev/null` || KERNEL_ARCH=`uname -m` +OLD_KERNEL_ARCH_TYPE=`sed -n 's_^/\* Kernel type \(.*\) \*/_\1_p' /boot/kernel.h 2>/dev/null` +if [ -n "$KERNEL_ARCH" -a "$KERNEL_ARCH$KERNEL_TYPE" != "$OLD_KERNEL_ARCH_TYPE" ]; then + TAPE='0' + VM='0' + case "$KERNEL_TYPE" in + -tape) TAPE='1';; + *) VM='1';; + esac + cat > /boot/kernel.h << EOF +/* This file is automatically generated at boot time. */ #ifndef __BOOT_KERNEL_H_ #define __BOOT_KERNEL_H_ -#define __BOOT_KERNEL_vrdr 0 -#define __BOOT_KERNEL_tape 0 +/* Kernel type $KERNEL_ARCH$KERNEL_TYPE */ + +#ifndef __MODULE_KERNEL_$KERNEL_ARCH +#define __MODULE_KERNEL_$KERNEL_ARCH 1 +#endif -#undef __BOOT_KERNEL_$KVER -#define __BOOT_KERNEL_$KVER 1 +#ifndef __BOOT_KERNEL_TAPE +#define __BOOT_KERNEL_TAPE $TAPE +#endif + +#ifndef __BOOT_KERNEL_VM +#define __BOOT_KERNEL_VM $VM +#endif #endif EOF +fi diff --git a/sysconfig/network-scripts/ifup-ctc b/sysconfig/network-scripts/ifup-ctc index 80c84391..56cb490e 100755 --- a/sysconfig/network-scripts/ifup-ctc +++ b/sysconfig/network-scripts/ifup-ctc @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # /etc/sysconfig/network-scripts/ifup-ctc # @@ -25,6 +25,18 @@ fi [ -n "${MTU}" ] && opts="${opts} mtu ${MTU}" ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${REMIP} + +# Wait for the device to come up - the chandev'ified ctc driver can take +# quite a while... +timeout=0 +while ! ping -w 30 -c ${REMIP} &>/dev/null; do + timeout=$(($timeout + 1)) + if [ $timeout = 20 ]; then + echo $"ERROR: ${DEVICE} did not come up!" + break + fi +done + if [ "${NETWORK}" != "" ] ; then route add -net ${NETWORK} netmask ${NETMASK} ${DEVICE} fi |