mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ar71xx: drop procd_init console hack

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

SVN-Revision: 36992
This commit is contained in:
John Crispin 2013-06-21 16:53:11 +00:00
parent 4999ae4236
commit 2be717560a
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ar71xx/base-files.mk
View File

@ -1,7 +1,3 @@
define Package/base-files/install-target define Package/base-files/install-target
rm -f $(1)/etc/config/network 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 endef

1
target/linux/ar71xx/base-files/etc/inittab
View File

@ -1,2 +1,3 @@
::sysinit:/etc/init.d/rcS S boot ::sysinit:/etc/init.d/rcS S boot
::shutdown:/etc/init.d/rcS K shutdown ::shutdown:/etc/init.d/rcS K shutdown
::askconsole:/bin/ash --login

27
target/linux/ar71xx/base-files/etc/uci-defaults/00_inittab-console-fixup
View File

@ -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