ar71xx: drop procd_init console hack

Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 36992

diff --git a/target/linux/ar71xx/base-files.mk b/target/linux/ar71xx/base-files.mk
index 5ee4dbd6d834357160909fac57ab4daa256341ba..fdd2c714b22892b9e72d9a8b89bd8288ccd4b797 100644 (file)
--- a/target/linux/ar71xx/base-files.mk
+++ b/target/linux/ar71xx/base-files.mk
@@ -1,7 +1,3 @@
 define Package/base-files/install-target
        rm -f $(1)/etc/config/network
-       $(if $(CONFIG_PROCD_INIT),rm -f  $(1)/etc/uci-defaults/00_inittab-console-fixup)
-       $(if $(CONFIG_PROCD_INIT),echo "::askconsole:/bin/ash --login" >> $(1)/etc/inittab)
 endef
-
-

diff --git a/target/linux/ar71xx/base-files/etc/inittab b/target/linux/ar71xx/base-files/etc/inittab
index 17f829f6d48acb66bd3a3d66c94252c2750510d5..7817185937f9ddb30fca2a417717be1a46e8ac11 100644 (file)
--- a/target/linux/ar71xx/base-files/etc/inittab
+++ b/target/linux/ar71xx/base-files/etc/inittab
@@ -1,2 +1,3 @@
 ::sysinit:/etc/init.d/rcS S boot
 ::shutdown:/etc/init.d/rcS K shutdown
+::askconsole:/bin/ash --login

diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/00_inittab-console-fixup b/target/linux/ar71xx/base-files/etc/uci-defaults/00_inittab-console-fixup
deleted file mode 100755 (executable)
index 4098b37..0000000
--- a/target/linux/ar71xx/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 ttyATH0; do
-               grep -qs "console=$cons" /proc/cmdline && {
-                       enable_console_login $cons
-               }
-       done
-}
-
-inittab_console_fixup
-
-exit 0