From 2f526b79cb5681ce2af9c75be681ffe9e2f01487 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 23 Jan 2014 06:55:50 +0000 Subject: 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 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39367 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/mpc85xx/base-files/etc/inittab | 2 -- .../etc/uci-defaults/00_inittab-console-fixup | 27 ---------------------- 2 files changed, 29 deletions(-) delete mode 100644 target/linux/mpc85xx/base-files/etc/inittab delete mode 100755 target/linux/mpc85xx/base-files/etc/uci-defaults/00_inittab-console-fixup (limited to 'target/linux/mpc85xx') 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 -- cgit v1.2.3