summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2016-04-18 21:53:07 +0200
committerJohn Crispin <blogic@openwrt.org>2016-04-18 21:53:07 +0200
commitdc929174095a00150de6a3e48d46355d24f223b9 (patch)
treef1106ba7c0d71f8072e5158c481f71aeee8db066 /package
parent5e85ae9e4c85e9ec43f38aa350c5bd0f0e7bea2b (diff)
downloadmaster-31e0f0ae-dc929174095a00150de6a3e48d46355d24f223b9.tar.gz
master-31e0f0ae-dc929174095a00150de6a3e48d46355d24f223b9.tar.bz2
master-31e0f0ae-dc929174095a00150de6a3e48d46355d24f223b9.zip
image / basefiles: make console password configurable
Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com> Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'package')
-rw-r--r--package/base-files/files/etc/config/system1
-rw-r--r--package/base-files/files/etc/inittab2
-rwxr-xr-xpackage/base-files/files/usr/libexec/login.sh5
-rw-r--r--package/utils/busybox/Config-defaults.in4
4 files changed, 9 insertions, 3 deletions
diff --git a/package/base-files/files/etc/config/system b/package/base-files/files/etc/config/system
index 20517f9a53..80c3f9b0a8 100644
--- a/package/base-files/files/etc/config/system
+++ b/package/base-files/files/etc/config/system
@@ -1,6 +1,7 @@
config system
option hostname lede
option timezone UTC
+ option ttylogin 0
config timeserver ntp
list server 0.openwrt.pool.ntp.org
diff --git a/package/base-files/files/etc/inittab b/package/base-files/files/etc/inittab
index 7817185937..9820e7144b 100644
--- a/package/base-files/files/etc/inittab
+++ b/package/base-files/files/etc/inittab
@@ -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
diff --git a/package/base-files/files/usr/libexec/login.sh b/package/base-files/files/usr/libexec/login.sh
new file mode 100755
index 0000000000..02ac9c828b
--- /dev/null
+++ b/package/base-files/files/usr/libexec/login.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ "$(uci get system.@system[0].ttylogin)" == 1 ] || exec /bin/ash --login
+
+exec /bin/login
diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index ee42fa12f0..5240616972 100644
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -1212,10 +1212,10 @@ config BUSYBOX_DEFAULT_GETTY
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