Author: luka Date: 2016-05-11 00:36:25 +0200 (Wed, 11 May 2016) New Revision: 49325
Added: trunk/package/base-files/files/usr/ trunk/package/base-files/files/usr/libexec/ trunk/package/base-files/files/usr/libexec/login.sh Modified: trunk/package/base-files/files/etc/config/system trunk/package/base-files/files/etc/inittab trunk/package/utils/busybox/Config-defaults.in trunk/target/linux/adm5120/base-files/etc/inittab trunk/target/linux/ar71xx/base-files/etc/inittab trunk/target/linux/arm64/base-files/etc/inittab trunk/target/linux/brcm2708/base-files/etc/inittab trunk/target/linux/ipq806x/base-files/etc/inittab trunk/target/linux/lantiq/base-files/etc/inittab trunk/target/linux/malta/base-files/etc/inittab trunk/target/linux/mediatek/base-files/etc/inittab trunk/target/linux/mxs/base-files/etc/inittab trunk/target/linux/omap/base-files/etc/inittab trunk/target/linux/omap24xx/base-files/etc/inittab trunk/target/linux/ppc44x/base-files/etc/inittab trunk/target/linux/ramips/base-files/etc/inittab trunk/target/linux/realview/base-files/etc/inittab trunk/target/linux/sunxi/base-files/etc/inittab trunk/target/linux/x86/base-files/etc/inittab trunk/target/linux/x86/xen_domu/base-files/etc/inittab trunk/target/linux/zynq/base-files/etc/inittab Log: image / basefiles: make console password configurable Signed-off-by: Daniel Dickinson <[email protected]> Signed-off-by: John Crispin <[email protected]> Modified: trunk/package/base-files/files/etc/config/system =================================================================== --- trunk/package/base-files/files/etc/config/system 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/package/base-files/files/etc/config/system 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,6 +1,7 @@ config system option hostname OpenWrt option timezone UTC + option ttylogin 0 config timeserver ntp list server 0.openwrt.pool.ntp.org Modified: trunk/package/base-files/files/etc/inittab =================================================================== --- trunk/package/base-files/files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/package/base-files/files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,3 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -::askconsole:/bin/ash --login +::askconsole:/usr/libexec/login.sh Added: trunk/package/base-files/files/usr/libexec/login.sh =================================================================== --- trunk/package/base-files/files/usr/libexec/login.sh (rev 0) +++ trunk/package/base-files/files/usr/libexec/login.sh 2016-05-10 22:36:25 UTC (rev 49325) @@ -0,0 +1,5 @@ +#!/bin/sh + +[ "$(uci get system.@system[0].ttylogin)" == 1 ] || exec /bin/ash --login + +exec /bin/login Modified: trunk/package/utils/busybox/Config-defaults.in =================================================================== --- trunk/package/utils/busybox/Config-defaults.in 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/package/utils/busybox/Config-defaults.in 2016-05-10 22:36:25 UTC (rev 49325) @@ -1212,10 +1212,10 @@ default n config BUSYBOX_DEFAULT_LOGIN bool - default n + default y config BUSYBOX_DEFAULT_LOGIN_SESSION_AS_CHILD bool - default n + default y config BUSYBOX_DEFAULT_LOGIN_SCRIPTS bool default n Modified: trunk/target/linux/adm5120/base-files/etc/inittab =================================================================== --- trunk/target/linux/adm5120/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/adm5120/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,5 +1,5 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -tts/0::askfirst:/bin/ash --login -ttyAM0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +tts/0::askfirst:/usr/libexec/login.sh +ttyAM0::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/ar71xx/base-files/etc/inittab =================================================================== --- trunk/target/linux/ar71xx/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/ar71xx/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,3 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -::askconsole:/bin/ash --login +::askconsole:/usr/libexec/login.sh Modified: trunk/target/linux/arm64/base-files/etc/inittab =================================================================== --- trunk/target/linux/arm64/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/arm64/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,5 +1,5 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -tts/0::askfirst:/bin/ash --login -ttyAMA0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +tts/0::askfirst:/usr/libexec/login.sh +ttyAMA0::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/brcm2708/base-files/etc/inittab =================================================================== --- trunk/target/linux/brcm2708/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/brcm2708/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,4 +1,4 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -::askconsole:/bin/ash --login -tty1::askfirst:/bin/ash --login +::askconsole:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/ipq806x/base-files/etc/inittab =================================================================== --- trunk/target/linux/ipq806x/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/ipq806x/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,4 +1,4 @@ # Copyright (c) 2013 The Linux Foundation. All rights reserved. ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -ttyMSM0::askfirst:/bin/ash --login +ttyMSM0::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/lantiq/base-files/etc/inittab =================================================================== --- trunk/target/linux/lantiq/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/lantiq/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,3 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K stop -ttyLTQ0::askfirst:/bin/ash --login +ttyLTQ0::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/malta/base-files/etc/inittab =================================================================== --- trunk/target/linux/malta/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/malta/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,7 +1,7 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -tts/0::askfirst:/bin/ash --login -ttyS0::askfirst:/bin/ash --login -ttyS1::askfirst:/bin/ash --login -ttyS2::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +tts/0::askfirst:/usr/libexec/login.sh +ttyS0::askfirst:/usr/libexec/login.sh +ttyS1::askfirst:/usr/libexec/login.sh +ttyS2::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/mediatek/base-files/etc/inittab =================================================================== --- trunk/target/linux/mediatek/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/mediatek/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,3 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -ttyS0::askfirst:/bin/ash --login +ttyS0::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/mxs/base-files/etc/inittab =================================================================== --- trunk/target/linux/mxs/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/mxs/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,3 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -ttyAMA0::askfirst:/bin/ash --login +ttyAMA0::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/omap/base-files/etc/inittab =================================================================== --- trunk/target/linux/omap/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/omap/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,5 +1,5 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -ttyO0::askfirst:/bin/ash --login -ttyO2::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +ttyO0::askfirst:/usr/libexec/login.sh +ttyO2::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/omap24xx/base-files/etc/inittab =================================================================== --- trunk/target/linux/omap24xx/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/omap24xx/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,5 +1,5 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -tts/0::askfirst:/bin/ash --login -ttyO2::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +tts/0::askfirst:/usr/libexec/login.sh +ttyO2::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/ppc44x/base-files/etc/inittab =================================================================== --- trunk/target/linux/ppc44x/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/ppc44x/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,4 +1,4 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -ttyS0::askfirst:/bin/ash --login -ttyS1::askfirst:/bin/ash --login +ttyS0::askfirst:/usr/libexec/login.sh +ttyS1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/ramips/base-files/etc/inittab =================================================================== --- trunk/target/linux/ramips/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/ramips/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,3 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -::askconsole:/bin/ash --login +::askconsole:/usr/libexec/login.sh Modified: trunk/target/linux/realview/base-files/etc/inittab =================================================================== --- trunk/target/linux/realview/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/realview/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,5 +1,5 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -tts/0::askfirst:/bin/ash --login -ttyAMA0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +tts/0::askfirst:/usr/libexec/login.sh +ttyAMA0::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/sunxi/base-files/etc/inittab =================================================================== --- trunk/target/linux/sunxi/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/sunxi/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,5 +1,5 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -tts/0::askfirst:/bin/ash --login -ttyS0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +tts/0::askfirst:/usr/libexec/login.sh +ttyS0::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/x86/base-files/etc/inittab =================================================================== --- trunk/target/linux/x86/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/x86/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,4 +1,4 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -ttyS0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +ttyS0::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/x86/xen_domu/base-files/etc/inittab =================================================================== --- trunk/target/linux/x86/xen_domu/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/x86/xen_domu/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,5 +1,5 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K stop -tts/0::askfirst:/bin/ash --login -hvc0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +tts/0::askfirst:/usr/libexec/login.sh +hvc0::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh Modified: trunk/target/linux/zynq/base-files/etc/inittab =================================================================== --- trunk/target/linux/zynq/base-files/etc/inittab 2016-05-10 22:36:15 UTC (rev 49324) +++ trunk/target/linux/zynq/base-files/etc/inittab 2016-05-10 22:36:25 UTC (rev 49325) @@ -1,3 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -::askconsole:/bin/ash --login \ No newline at end of file +::askconsole:/usr/libexec/login.sh _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
