From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 23 Jan 2014 06:55:50 +0000 (+0000)
Subject: mpc85xx: Remove inittab workaround
X-Git-Tag: reboot~8103
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=30af45d19a80e00225d245c03bee3f21c55a1a99;p=openwrt%2Fstaging%2Fnoltari.git

mpc85xx: Remove inittab workaround

The default inittab uses "askconsole" which is implemented by procd
and uses the console provided by the kernel command line.

Hence, this platform specific workaround is not necessary anymore.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39367
---

diff --git a/target/linux/mpc85xx/base-files/etc/inittab b/target/linux/mpc85xx/base-files/etc/inittab
deleted file mode 100644
index 17f829f6d4..0000000000
--- a/target/linux/mpc85xx/base-files/etc/inittab
+++ /dev/null
@@ -1,2 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K shutdown
diff --git a/target/linux/mpc85xx/base-files/etc/uci-defaults/00_inittab-console-fixup b/target/linux/mpc85xx/base-files/etc/uci-defaults/00_inittab-console-fixup
deleted file mode 100755
index 9d7b2aea22..0000000000
--- a/target/linux/mpc85xx/base-files/etc/uci-defaults/00_inittab-console-fixup
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-enable_console_login() {
-	local cons=$1
-	local initline="$cons::askfirst:/bin/ash --login"
-
-	grep -qs "^$initline" /etc/inittab || {
-		echo "$initline" >> /etc/inittab
-		sync
-		kill -HUP 1
-	}
-}
-
-inittab_console_fixup() {
-	for cons in ttyS0 ttyS1; do
-		grep -qs "console=$cons" /proc/cmdline && {
-			enable_console_login $cons
-		}
-	done
-}
-
-inittab_console_fixup
-
-exit 0