diff options
| author | John Crispin <john@openwrt.org> | 2013-06-21 16:53:11 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-06-21 16:53:11 +0000 |
| commit | 2be717560ac9bf55cf94253d16c1d271d71c5df6 (patch) | |
| tree | d8355715c62041fa87afd8ea381033ee59d72e65 /target | |
| parent | 4999ae4236bb1951fdefce2745b5749e644873f6 (diff) | |
| download | upstream-2be717560ac9bf55cf94253d16c1d271d71c5df6.tar.gz upstream-2be717560ac9bf55cf94253d16c1d271d71c5df6.tar.bz2 upstream-2be717560ac9bf55cf94253d16c1d271d71c5df6.zip | |
ar71xx: drop procd_init console hack
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 36992
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ar71xx/base-files.mk | 4 | ||||
| -rw-r--r-- | target/linux/ar71xx/base-files/etc/inittab | 1 | ||||
| -rwxr-xr-x | target/linux/ar71xx/base-files/etc/uci-defaults/00_inittab-console-fixup | 27 |
3 files changed, 1 insertions, 31 deletions
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 |