diff options
| author | Karsten Hopp <karsten@redhat.com> | 2001-07-05 16:24:19 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@redhat.com> | 2001-07-05 16:24:19 +0000 |
| commit | f8c546cb290916b4f120513987722e4fa4ce64d3 (patch) | |
| tree | bfc6be81a67c82bb73c72d9c7b12e839726664e2 /initscripts-s390.patch | |
| parent | 3d293aa2f3252963514212ba25baf2dc139d997d (diff) | |
| download | initscripts-f8c546cb290916b4f120513987722e4fa4ce64d3.tar.gz initscripts-f8c546cb290916b4f120513987722e4fa4ce64d3.tar.xz initscripts-f8c546cb290916b4f120513987722e4fa4ce64d3.zip | |
S390-only changesr5-98
Diffstat (limited to 'initscripts-s390.patch')
| -rw-r--r-- | initscripts-s390.patch | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/initscripts-s390.patch b/initscripts-s390.patch new file mode 100644 index 00000000..f85fd973 --- /dev/null +++ b/initscripts-s390.patch @@ -0,0 +1,101 @@ +--- 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 @@ + ;; + esac + +-runcmd $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS ++if [ -x /sbin/hwclock ] ; then ++ runcmd $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS ++fi + + # 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 +@@ -105,9 +105,13 @@ + ;; + esac + +-/sbin/hwclock $CLOCKFLAGS +- +-action $"Setting clock $CLOCKDEF: `date`" date ++if [ -x /sbin/hwclock ] ; then ++ /sbin/hwclock $CLOCKFLAGS ++ action $"Setting clock $CLOCKDEF: `date`" date ++else ++ # System date on S390 is always set correctly ++ action $"System date: `date` " date ++fi + + if [ "`/sbin/consoletype`" == "vt" ]; then + # Load keymap +@@ -269,6 +273,9 @@ + else + action $"Skipping ISA PNP configuration at users request: " /bin/true + fi ++else ++ # No /sbin/isapnp => no PNP ++ PNP= + fi + + # Remount the root filesystem read-write. +@@ -276,6 +283,24 @@ + [ "$state" != "rw" ] && \ + action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw / + ++# Fix up kernel versioning on binary-only modules ++if [ -x /sbin/oco-setkver ]; then ++ kver=`</proc/sys/kernel/osrelease` ++ kernelver=`echo $kver|awk -F '-' '{ print $1 }'` ++ if [ "$HOSTTYPE" == "s390x" ]; then ++ kernelver="${kernelver}x" ++ fi ++ if [ "${kver:0:3}" == "2.4" ]; then ++ modpath="/lib/modules/$kver/kernel/net" ++ else ++ modpath="/lib/modules/$kver/net" ++ fi ++ for i in /lib/modules/ibm-$kernelver/net/*; do ++ [ -e $i ] || break ++ /sbin/oco-setkver $kver $i $modpath/`basename $i` ++ done ++fi ++ + # 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 +@@ -560,17 +585,25 @@ + if [ -x /usr/bin/passwd ]; then + /usr/bin/passwd root + fi +- if [ -x /usr/sbin/netconfig ]; then +- /usr/sbin/netconfig ++ ++ # on S390 console we don't have newt ++ if [ "`/bin/arch`" = "s390" ] ; then ++ ARCH=".s390" ++ else ++ ARCH="" ++ fi ++ ++ if [ -x /usr/sbin/netconfig$ARCH ]; then ++ /usr/sbin/netconfig$ARCH + fi +- if [ -x /usr/sbin/timeconfig ]; then +- /usr/sbin/timeconfig ++ if [ -x /usr/sbin/timeconfig$ARCH ]; then ++ /usr/sbin/timeconfig$ARCH + fi +- if [ -x /usr/sbin/authconfig ]; then +- /usr/sbin/authconfig --nostart ++ if [ -x /usr/sbin/authconfig$ARCH ]; then ++ /usr/sbin/authconfig$ARCH --nostart + fi +- if [ -x /usr/sbin/ntsysv ]; then +- /usr/sbin/ntsysv --level 35 ++ if [ -x /usr/sbin/ntsysv$ARCH ]; then ++ /usr/sbin/ntsysv$ARCH --level 35 + fi + + # Reread in network configuration data. |