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>

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 9eddf1559baf33b49bc73299ffd1f1e0f876e242..f0bb519aece4f488c8c24310ede6d9ec338f8617 100644 (file)
--- 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