redirect passwd stderr to stdout in webif

SVN-Revision: 3154

diff --git a/openwrt/package/webif/files/usr/lib/webif/webif.sh b/openwrt/package/webif/files/usr/lib/webif/webif.sh
index 1a665a814fbdf987c7b1bdf30e9965812187b0f3..4894954f37ee1fa5883212e38ca066cd3792f1df 100644 (file)
--- a/openwrt/package/webif/files/usr/lib/webif/webif.sh
+++ b/openwrt/package/webif/files/usr/lib/webif/webif.sh
@@ -121,7 +121,7 @@ EOF
                                echo "$FORM_passwd1"
                                sleep 1
                                echo "$FORM_passwd2"
-                       ) | passwd root && apply_passwd
+                       ) | passwd root 2>&1 && apply_passwd
                        echo '</pre>'
                        footer
                        exit

diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/password.sh b/openwrt/package/webif/files/www/cgi-bin/webif/password.sh
index 73967a09564acaabc0429f5e9ba2f8da7ede435b..598964ff3fbd6e8bd1e772dbe68eff97ff648afe 100755 (executable)
--- a/openwrt/package/webif/files/www/cgi-bin/webif/password.sh
+++ b/openwrt/package/webif/files/www/cgi-bin/webif/password.sh
@@ -16,7 +16,7 @@ EOF
                                echo "$FORM_pw1"
                                sleep 1
                                echo "$FORM_pw2"
-                       ) | passwd root
+                       ) | passwd root 2>&1
                )
                equal "$?" 0 || ERROR="<pre>$RES</pre>"
        }