From d30657ba28b08b724f88d13a84f791e90e91eedf Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 21 Jun 2013 16:53:11 +0000
Subject: ar71xx: drop procd_init console hack

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36992 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/ar71xx/base-files.mk                  |  4 ----
 target/linux/ar71xx/base-files/etc/inittab         |  1 +
 .../etc/uci-defaults/00_inittab-console-fixup      | 27 ----------------------
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100755 target/linux/ar71xx/base-files/etc/uci-defaults/00_inittab-console-fixup

(limited to 'target/linux/ar71xx')

diff --git a/target/linux/ar71xx/base-files.mk b/target/linux/ar71xx/base-files.mk
index 5ee4dbd6d8..fdd2c714b2 100644
--- 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 17f829f6d4..7817185937 100644
--- 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
index 4098b37a71..0000000000
--- 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
-- 
cgit v1.2.3