From 3c45f0b8149f2970d65069cd5ea96d15aa8f0356 Mon Sep 17 00:00:00 2001
From: ficus <ficus@robocracy.org>
Date: Mon, 19 Nov 2012 17:49:19 +0100
Subject: roll back to recommended inittab/serial setup

---
 config/includes.chroot/etc/inittab                 | 61 ----------------------
 .../lib/live/config/018-serial_console             | 28 ++++++++++
 .../lib/live/config/9999-serial_console            | 30 -----------
 3 files changed, 28 insertions(+), 91 deletions(-)
 delete mode 100644 config/includes.chroot/etc/inittab
 create mode 100755 config/includes.chroot/lib/live/config/018-serial_console
 delete mode 100755 config/includes.chroot/lib/live/config/9999-serial_console

(limited to 'config')

diff --git a/config/includes.chroot/etc/inittab b/config/includes.chroot/etc/inittab
deleted file mode 100644
index 91e6d10..0000000
--- a/config/includes.chroot/etc/inittab
+++ /dev/null
@@ -1,61 +0,0 @@
-# /etc/inittab: init(8) configuration.
-# $Id: inittab,v 1.91 2002/01/25 13:35:21 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>
-#
-# Note that on most Debian systems tty7 is used by the X Window System,
-# so if you want to add more getty's go ahead but skip tty7 if you run X.
-#
-1:2345:respawn:/sbin/getty 38400 tty1
-#2:23:respawn:/sbin/getty 38400 tty2
-#3:23:respawn:/sbin/getty 38400 tty3
-#4:23:respawn:/sbin/getty 38400 tty4
-#5:23:respawn:/sbin/getty 38400 tty5
-#6:23:respawn:/sbin/getty 38400 tty6
-
-T0:12345:respawn:/sbin/getty -L ttyS0 115200 vt100
diff --git a/config/includes.chroot/lib/live/config/018-serial_console b/config/includes.chroot/lib/live/config/018-serial_console
new file mode 100755
index 0000000..745b0b0
--- /dev/null
+++ b/config/includes.chroot/lib/live/config/018-serial_console
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+STATEFILE=/var/lib/live/config/serialconsole
+
+Serialconsole ()
+{
+	# Checking that we haven't already run
+	if [ -e ${STATEFILE} ]
+	then
+		return
+	fi
+	
+	echo -n " serial console"
+	
+	Configure_serialconsole
+}
+
+Configure_serialconsole ()
+{
+	# Note unusual delimiters
+	sed -i -e "s|#\(T0:.*\?/dev/\)\(tty\)\(.*\?/dev/\)\(tty\)\(.*\)|\1\2S0\3\4S0\5|" /etc/inittab
+	init q
+
+	# Creating state file
+	touch ${STATEFILE}
+}
+
+Serialconsole
diff --git a/config/includes.chroot/lib/live/config/9999-serial_console b/config/includes.chroot/lib/live/config/9999-serial_console
deleted file mode 100755
index 8ade5da..0000000
--- a/config/includes.chroot/lib/live/config/9999-serial_console
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-STATEFILE=/var/lib/live/config/serialconsole
-
-Serialconsole ()
-{
-	# Checking that we haven't already run
-	if [ -e ${STATEFILE} ]
-	then
-		return
-	fi
-	
-	echo -n " serial console"
-	
-	Configure_serialconsole
-}
-
-Configure_serialconsole ()
-{
-	# Note unusual delimiters
-    # This *fixes*, but does not necessarily enable...
-	sed -i -e "s|\(T0:.*\?/dev/\)\(tty\)\(.*\?/dev/\)\(tty\)\(.*\)|\1\2S0\3\4S0\5|" /etc/inittab
-    tail /etc/inittab
-	init q
-
-	# Creating state file
-	touch ${STATEFILE}
-}
-
-Serialconsole
-- 
cgit v1.2.3