aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-01-23 06:55:50 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-01-23 06:55:50 +0000
commit2f526b79cb5681ce2af9c75be681ffe9e2f01487 (patch)
treefe5f38142263cf7d89b7570a39a39332f260c9f4 /target/linux
parent27a8f6583e65734b507bc1d208cb89b76909b3b8 (diff)
downloadupstream-2f526b79cb5681ce2af9c75be681ffe9e2f01487.tar.gz
upstream-2f526b79cb5681ce2af9c75be681ffe9e2f01487.tar.bz2
upstream-2f526b79cb5681ce2af9c75be681ffe9e2f01487.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39367 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mpc85xx/base-files/etc/inittab2
-rwxr-xr-xtarget/linux/mpc85xx/base-files/etc/uci-defaults/00_inittab-console-fixup27
2 files changed, 0 insertions, 29 deletions
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