[Pkg-sysvinit-devel] Bug#641107: sysvinit: missing support for s390x

[Aurelien Jarno]

Package: sysvinit
Version: 2.88dsf-13.11
Severity: normal
Tags: patch
User: debian-s390 at lists.debian.org
Usertags: s390x

sysvinit builds fine on s390x, but it needs the same fixes as on s390, 
that is a slightly different inittab and spinners removal due to the 
dumb console available on s390x.

The patch below fixes that. Please note that for the spinner removal it
simply replaces s390 by s390x as anyway Debian now only supports 64-bit
kernel on s390, so 'uname -m' returns 's390x' on both s390 and s390x.

Would it be possible to include this patch in the next upload? Thanks in
advance.

diff -u sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/checkfs.sh sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/checkfs.sh
--- sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/checkfs.sh
+++ sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/checkfs.sh
@@ -77,7 +77,7 @@
 			spinner=""
 			;;
 		esac
-		[ "$(uname -m)" = s390 ] && spinner=""  # This should go away
+		[ "$(uname -m)" = s390x ] && spinner=""  # This should go away
 		FSCKTYPES_OPT=""
 		[ "$FSCKTYPES" ] && FSCKTYPES_OPT="-t $FSCKTYPES"
 		handle_failed_fsck() {
diff -u sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/checkroot.sh sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/checkroot.sh
--- sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/checkroot.sh
+++ sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/checkroot.sh
@@ -204,8 +204,8 @@
 		  dumb|network|unknown|"")
 			spinner="" ;;
 		esac
-		# This Linux/s390 special case should go away.
-		if [ "${KERNEL}:${MACHINE}" = Linux:s390 ]
+		# This Linux/s390x special case should go away.
+		if [ "${KERNEL}:${MACHINE}" = Linux:s390x ]
 		then
 			spinner=""
 		fi
only in patch2:
unchanged:
--- sysvinit-2.88dsf.orig/debian/share/inittab.s390x-linux-gnu
+++ sysvinit-2.88dsf/debian/share/inittab.s390x-linux-gnu
@@ -0,0 +1,63 @@
+# /etc/inittab: init(8) configuration.
+# $Id: inittab.s390x,v 1.9 2000/01/10 10:15:30 miquels Exp $
+
+# The default runlevel.
+id:2:initdefault:
+
+# Boot-time system configuration/initialization script.
+# This is run first except when booting in emergency (-b) mode.
+si::sysinit:/etc/init.d/rcS
+
+# What to do in single-user mode.
+~~:S:wait:/sbin/sulogin
+
+# /etc/init.d executes the S and K scripts upon change
+# of runlevel.
+#
+# Runlevel 0 is halt.
+# Runlevel 1 is single-user.
+# Runlevels 2-5 are multi-user.
+# Runlevel 6 is reboot.
+
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
+
+# What to do when CTRL-ALT-DEL is pressed.
+ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
+
+# Action on special keypress (ALT-UpArrow).
+kb::kbrequest:/bin/echo "Keyboard Request--edit /etc/inittab to let this work."
+
+# What to do when the power fails/returns.
+pf::powerwait:/etc/init.d/powerfail start
+pn::powerfailnow:/etc/init.d/powerfail now
+po::powerokwait:/etc/init.d/powerfail stop
+
+# /sbin/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+#  <id>:<runlevels>:<action>:<process>
+#
+# The s390x only has a dumb terminal on /dev/console.
+#
+1:2345:respawn:/sbin/getty 38400 console dumb
+
+# Example how to put a getty on a serial line (for a terminal)
+#
+#T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100
+#T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100
+
+# Example how to put a getty on a modem line.
+#
+#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3
+


-- System Information:
Debian Release: wheezy/sid
  APT prefers unreleased
  APT policy: (500, 'unreleased'), (500, 'unstable')
Architecture: s390x

Kernel: Linux 3.0.0-1-s390x (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash