diff options
| author | Florian La Roche <laroche@redhat.com> | 2001-04-25 12:09:08 +0000 |
|---|---|---|
| committer | Florian La Roche <laroche@redhat.com> | 2001-04-25 12:09:08 +0000 |
| commit | 8135d5d68a222512111dccb25ab7ba3d9160b55b (patch) | |
| tree | 84415d1a646af0808af36fc9f6e0ba59a7cdf1c4 | |
| parent | 2233e084fc67b5da42480b63cd6525067efc29b3 (diff) | |
| download | initscripts-8135d5d68a222512111dccb25ab7ba3d9160b55b.tar initscripts-8135d5d68a222512111dccb25ab7ba3d9160b55b.tar.gz initscripts-8135d5d68a222512111dccb25ab7ba3d9160b55b.tar.bz2 initscripts-8135d5d68a222512111dccb25ab7ba3d9160b55b.tar.xz initscripts-8135d5d68a222512111dccb25ab7ba3d9160b55b.zip | |
further s390 changes
| -rw-r--r-- | initscripts.spec | 6 | ||||
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rwxr-xr-x | src/mkkerneldoth.s390 | 21 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-iucv | 36 |
4 files changed, 66 insertions, 0 deletions
diff --git a/initscripts.spec b/initscripts.spec index 72025df8..7eef890d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -213,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT %config /etc/sysconfig/network-scripts/ifup-ipx %ifarch s390 s390x %config /etc/sysconfig/network-scripts/ifup-ctc +%config /etc/sysconfig/network-scripts/ifup-iucv %endif %config /etc/X11/prefdm %config /etc/inittab @@ -255,6 +256,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed Apr 25 2001 Florian La Roche <Florian.LaRoche@redhat.de> +- add further s390 changes: + - ifup-iucv + - mkkerneldoth.s390 + * Tue Apr 24 2001 Than Ngo <than@redhat.com> - add shutdown UPS into halt (bug #34312) diff --git a/src/Makefile b/src/Makefile index 9e642e6e..92b6e8e8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -35,6 +35,9 @@ install: install -m 644 consoletype.1 $(ROOT)$(mandir)/man1 install -m 644 initlog.conf $(ROOT)/etc install -m 755 mkkerneldoth $(ROOT)/sbin + if uname -m | grep -q s390 ; then \ + install -m 755 mkkerneldoth.s390 $(ROOT)/sbin/mkkerneldoth ; \ + fi # this daemon and initscript are useful for testing the up/down/status stuff # not installed by default, only comes from sources. diff --git a/src/mkkerneldoth.s390 b/src/mkkerneldoth.s390 new file mode 100755 index 00000000..137c15ec --- /dev/null +++ b/src/mkkerneldoth.s390 @@ -0,0 +1,21 @@ +#!/bin/bash +# +# Generate a header that defines the boot kernel. +# + +KVER=`uname -r | sed 's/[^a-zA-Z]//g'` + +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 + +#undef __BOOT_KERNEL_$KVER +#define __BOOT_KERNEL_$KVER 1 + +#endif +EOF diff --git a/sysconfig/network-scripts/ifup-iucv b/sysconfig/network-scripts/ifup-iucv new file mode 100755 index 00000000..fd08919a --- /dev/null +++ b/sysconfig/network-scripts/ifup-iucv @@ -0,0 +1,36 @@ +#!/bin/sh +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +cd /etc/sysconfig/network-scripts +. network-functions + +CONFIG=$1 +source_config + +if [ "foo$2" = "fooboot" -a "${ONBOOT}" = "no" ] +then + exit +fi +[ -n "${MTU}" ] && opts="${opts} mtu ${MTU}" + +ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${REMIP} +if [ "${NETWORK}" != "" ] ; then + route add -net ${NETWORK} netmask ${NETMASK} ${DEVICE} +fi + +# this is broken! it's only here to keep compatibility with old RH sytstems +if [ "${GATEWAY}" != "" -a "${GATEWAY}" != "none" ] +then + route add default gw ${GATEWAY} metric 1 ${DEVICE} +fi + +. /etc/sysconfig/network + +if [ "${GATEWAY}" != "" ]; then + if [ "${GATEWAYDEV}" = "" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then + # set up default gateway + route add default gw ${GATEWAY} + fi +fi + +/etc/sysconfig/network-scripts/ifup-post $1 |