S390-only changesr5-98

2 files changed, 111 insertions, 1 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.
diff --git a/initscripts.spec b/initscripts.spec
index 30cd55ca..b95c0067 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,10 +1,11 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 5.97
+Version: 5.98
 License: GPL
 Group: System Environment/Base
 Release: 1
 Source: initscripts-%{version}.tar.bz2
+Patch0: initscripts-s390.patch
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
 Requires: procps >= 2.0.7-7, sysklogd >= 1.3.31
@@ -28,6 +29,9 @@ deactivate most network interfaces.
 
 %prep
 %setup -q
+%ifarch s390 s390x
+%patch0 -p1 -b .s390init
+%endif
 
 %build
 make
@@ -222,6 +226,11 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Thu Jul 05 2001 Karsten Hopp <karsten@redhat.de>
+- disable hwclock on S390 (no such executable)
+- Fix up kernel versioning on binary-only modules (S390)
+- don't use newt scripts on S390 console
+
 * Sat Jul 01 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - reenable pump, but make sure dhcpcd is the default. This
   way, upgrades of systems without dhcpcd has a better chance at