From: John Crispin Date: Tue, 12 Nov 2024 06:49:22 +0000 (+0100) Subject: base-files: improve default root-passwd script X-Git-Tag: v24.10.0-rc1~140 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e39f5d4b360ca3e163550592cea35949f0ea8622;p=openwrt%2Fopenwrt.git 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 --- diff --git a/package/base-files/files/etc/uci-defaults/50-root-passwd b/package/base-files/files/etc/uci-defaults/50-root-passwd index 9eddf1559b..f0bb519aec 100644 --- a/package/base-files/files/etc/uci-defaults/50-root-passwd +++ b/package/base-files/files/etc/uci-defaults/50-root-passwd @@ -3,10 +3,16 @@ json_init json_load "$(cat /etc/board.json)" -json_select credentials - 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 json_is_a credentials object; then + json_select credentials + json_get_vars root_password_hash root_password_hash + 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 - [ -z "$root_password_plain" ] || { (echo "$root_password_plain"; sleep 1; echo "$root_password_plain") | passwd root } -json_select .. + json_get_vars root_password_plain root_password_plain + if [ -n "$root_password_plain" ]; then + (echo "$root_password_plain"; sleep 1; echo "$root_password_plain") | passwd root + fi + json_select .. +fi