diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | initscripts.spec | 7 | ||||
| -rw-r--r-- | inittab.s390 | 52 | ||||
| -rw-r--r-- | sysconfig/init.s390 | 21 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ctc | 36 | ||||
| -rw-r--r-- | sysctl.conf.s390 | 4 |
6 files changed, 131 insertions, 5 deletions
@@ -14,6 +14,9 @@ install: mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin $(ROOT)/usr/sbin mkdir -p $(ROOT)$(mandir)/man8 install -m644 inittab $(ROOT)/etc + if uname -m | grep -q s390 ; then \ + install -m644 inittab.s390 $(ROOT)/etc/inittab ; \ + fi install -m644 adjtime $(ROOT)/etc install -m755 setsysfont $(ROOT)/sbin install -m755 lang.sh $(ROOT)/etc/profile.d @@ -21,11 +24,11 @@ install: install -m755 service $(ROOT)/sbin install -m755 sys-unconfig $(ROOT)/usr/sbin install -m644 sys-unconfig.8 $(ROOT)$(mandir)/man8 - ( if uname -m | grep -q sparc ; then \ - install -m644 sysctl.conf.sparc $(ROOT)/etc/sysctl.conf ; \ - else \ - install -m644 sysctl.conf $(ROOT)/etc/sysctl.conf ; \ - fi ) + install -m644 sysctl.conf $(ROOT)/etc/sysctl.conf + if uname -m | grep -q sparc ; then \ + install -m644 sysctl.conf.sparc $(ROOT)/etc/sysctl.conf ; fi + if uname -m | grep -q s390 ; then \ + install -m644 sysctl.conf.s390 $(ROOT)/etc/sysctl.conf ; fi mkdir -p $(ROOT)/etc/X11 install -m755 prefdm $(ROOT)/etc/X11/prefdm mkdir -p $(ROOT)/etc/sysconfig @@ -33,6 +36,9 @@ install: install -m644 sysconfig/init $(ROOT)/etc/sysconfig/init install -m644 sysconfig/rawdevices $(ROOT)/etc/sysconfig/rawdevices cp -af rc.d sysconfig ppp $(ROOT)/etc + if uname -m | grep -q s390 ; then \ + install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \ + fi mkdir -p $(ROOT)/sbin mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/sbin diff --git a/initscripts.spec b/initscripts.spec index 6b4fc3fd..7785267e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -211,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT %config /etc/sysconfig/network-scripts/ifdown-sit %config /etc/sysconfig/network-scripts/ifup-aliases %config /etc/sysconfig/network-scripts/ifup-ipx +%ifarch s390 s390x +%config /etc/sysconfig/network-scripts/ifup-ctc +%endif %config /etc/X11/prefdm %config /etc/inittab %dir /etc/rc.d @@ -251,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Sat Feb 10 2001 Florian La Roche <Florian.LaRoche@redhat.de> +- add all save changes for s390 s390x that won't break anything + patches are from Oliver Paukstadt @ millenux.com + * Fri Feb 9 2001 Bill Nottingham <notting@redhat.com> - muck with the font in lang.csh/lang.sh, but don't spit out errors (#26903) diff --git a/inittab.s390 b/inittab.s390 new file mode 100644 index 00000000..d82c7988 --- /dev/null +++ b/inittab.s390 @@ -0,0 +1,52 @@ +# +# inittab This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org> +# Modified for RHS Linux by Marc Ewing and Donnie Barnes +# + +# Default runlevel. The runlevels used by RHS are: +# 0 - halt (Do NOT set initdefault to this) +# 1 - Single user mode +# 2 - Multiuser, without NFS (The same as 3, if you do not have networking) +# 3 - Full multiuser mode +# 4 - unused +# 5 - X11 +# 6 - reboot (Do NOT set initdefault to this) +# +id:3:initdefault: + +# System initialization. +si::sysinit:/etc/rc.d/rc.sysinit + +l0:0:wait:/etc/rc.d/rc 0 +l1:1:wait:/etc/rc.d/rc 1 +l2:2:wait:/etc/rc.d/rc 2 +l3:3:wait:/etc/rc.d/rc 3 +l4:4:wait:/etc/rc.d/rc 4 +l5:5:wait:/etc/rc.d/rc 5 +l6:6:wait:/etc/rc.d/rc 6 + +# Things to run in every runlevel. +ud::once:/sbin/update + +# Trap CTRL-ALT-DELETE +ca::ctrlaltdel:/sbin/shutdown -t3 -r now + +# When our UPS tells us power has failed, assume we have a few minutes +# of power left. Schedule a shutdown for 2 minutes from now. +# This does, of course, assume you have powerd installed and your +# UPS connected and working correctly. +pf::powerfail:/sbin/shutdown -f -h +2 "Power Failure; System Shutting Down" + +# If power was restored before the shutdown kicked in, cancel it. +pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled" + + +# Run gettys in standard runlevels +1:2345:respawn:/sbin/mingetty console --noclear + +# Run xdm in runlevel 5 +# xdm is now a separate service +x:5:respawn:/etc/X11/prefdm -nodaemon diff --git a/sysconfig/init.s390 b/sysconfig/init.s390 new file mode 100644 index 00000000..ffcd0ede --- /dev/null +++ b/sysconfig/init.s390 @@ -0,0 +1,21 @@ +# color => new RH6.0 bootup +# verbose => old-style bootup +# anything else => new style bootup without ANSI colors or positioning +BOOTUP=serial +# column to start "[ OK ]" label in +RES_COL=60 +# terminal sequence to move to that column. You could change this +# to something like "tput hpa ${RES_COL}" if your terminal supports it +MOVE_TO_COL= +# terminal sequence to set color to a 'success' color (currently: green) +SETCOLOR_SUCCESS= +# terminal sequence to set color to a 'failure' color (currently: red) +SETCOLOR_FAILURE= +# terminal sequence to set color to a 'warning' color (currently: yellow) +SETCOLOR_WARNING= +# terminal sequence to reset to the default color. +SETCOLOR_NORMAL= +# default kernel loglevel on boot (syslog will reset this) +LOGLEVEL=1 +# Set to anything other than 'no' to allow hotkey interactive startup... +PROMPT=no diff --git a/sysconfig/network-scripts/ifup-ctc b/sysconfig/network-scripts/ifup-ctc new file mode 100755 index 00000000..fd08919a --- /dev/null +++ b/sysconfig/network-scripts/ifup-ctc @@ -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 diff --git a/sysctl.conf.s390 b/sysctl.conf.s390 new file mode 100644 index 00000000..b6a2150b --- /dev/null +++ b/sysctl.conf.s390 @@ -0,0 +1,4 @@ +# Disables packet forwarding +net.ipv4.ip_forward = 0 +# Enables source route verification +net.ipv4.conf.all.rp_filter = 1 |