base-files: improve default root-passwd script
The script was not exiting cleanly causing it to not be removed from the uci-defaults folder. Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
parent
4c65359af4
commit
b902284290
|
@ -3,10 +3,16 @@
|
||||||
json_init
|
json_init
|
||||||
json_load "$(cat /etc/board.json)"
|
json_load "$(cat /etc/board.json)"
|
||||||
|
|
||||||
json_select credentials
|
if json_is_a credentials object; then
|
||||||
|
json_select credentials
|
||||||
json_get_vars root_password_hash root_password_hash
|
json_get_vars root_password_hash root_password_hash
|
||||||
[ -z "$root_password_hash" ] || sed -i "s|^root:[^:]*|root:$root_password_hash|g" /etc/shadow
|
if [ -n "$root_password_hash" ]; then
|
||||||
|
sed -i "s|^root:[^:]*|root:$root_password_hash|g" /etc/shadow
|
||||||
|
fi
|
||||||
|
|
||||||
json_get_vars root_password_plain root_password_plain
|
json_get_vars root_password_plain root_password_plain
|
||||||
[ -z "$root_password_plain" ] || { (echo "$root_password_plain"; sleep 1; echo "$root_password_plain") | passwd root }
|
if [ -n "$root_password_plain" ]; then
|
||||||
json_select ..
|
(echo "$root_password_plain"; sleep 1; echo "$root_password_plain") | passwd root
|
||||||
|
fi
|
||||||
|
json_select ..
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in New Issue