diff -u mysql-dfsg-5.0-5.0.51a/debian/changelog mysql-dfsg-5.0-5.0.51a/debian/changelog --- mysql-dfsg-5.0-5.0.51a/debian/changelog +++ mysql-dfsg-5.0-5.0.51a/debian/changelog @@ -1,3 +1,9 @@ +mysql-dfsg-5.0 (5.0.51a-3ubuntu3) hardy; urgency=low + + * Confirming password on install if gived (LP: #162167) + + -- Nicolas Valcárcel Thu, 20 Mar 2008 00:12:00 -0500 + mysql-dfsg-5.0 (5.0.51a-3ubuntu2) hardy; urgency=low * debian/patches/92_fix_order_by32202.dpatch: fix for ORDER BY not working diff -u mysql-dfsg-5.0-5.0.51a/debian/mysql-server-5.0.config mysql-dfsg-5.0-5.0.51a/debian/mysql-server-5.0.config --- mysql-dfsg-5.0-5.0.51a/debian/mysql-server-5.0.config +++ mysql-dfsg-5.0-5.0.51a/debian/mysql-server-5.0.config @@ -17,8 +17,31 @@ # there is also an additional check for empty root passwords in the # postinst script when the tools are available for us to use. if [ "$1" = "configure" ] && [ -z "$2" ] || [ "$1" = "reconfigure" ]; then - db_input high mysql-server/root_password || true - db_go + while :; do + RET="" + db_input high mysql-server/root_password || true + db_go + db_get mysql-server/root_password + # if password isn't empty we ask for password verification + if [ -z "$RET" ]; then + db_fset mysql-server/root_password seen false + db_fset mysql-server/root_password_again seen false + break + fi + ROOT_PW="$RET" + db_input high mysql-server/root_password_again || true + db_go + db_get mysql-server/root_password_again + if [ "$RET" == "$ROOT_PW" ]; then + ROOT_PW='' + break + fi + db_fset mysql-server/password_mismatch seen false + db_input critical mysql-server/password_mismatch + db_set mysql-server/root_password "" + db_set mysql-server/root_password_again "" + db_go + done fi # If this is an upgrade of an already existing installation ask the user if diff -u mysql-dfsg-5.0-5.0.51a/debian/mysql-server-5.0.templates mysql-dfsg-5.0-5.0.51a/debian/mysql-server-5.0.templates --- mysql-dfsg-5.0-5.0.51a/debian/mysql-server-5.0.templates +++ mysql-dfsg-5.0-5.0.51a/debian/mysql-server-5.0.templates @@ -60,6 +60,11 @@ . If that field is left blank, the password will not be changed. +Template: mysql-server/root_password_again +Type: password +_Description: Repeat password for the MySQL "root" user: + + Template: mysql-server/error_setting_password Type: error _Description: Unable to set password for the MySQL "root" user @@ -73,6 +78,11 @@ Please read the /usr/share/doc/mysql-server-5.0/README.Debian file for more information. +Template: mysql-server/password_mismatch +Type: error +_Description: Password input error + The two passwords you entered were not the same. Please try again. + Template: mysql-server-5.0/need_sarge_compat Type: boolean Default: false diff -u mysql-dfsg-5.0-5.0.51a/debian/po/ar.po mysql-dfsg-5.0-5.0.51a/debian/po/ar.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/nb.po mysql-dfsg-5.0-5.0.51a/debian/po/nb.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/da.po mysql-dfsg-5.0-5.0.51a/debian/po/da.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/sv.po mysql-dfsg-5.0-5.0.51a/debian/po/sv.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/pt.po mysql-dfsg-5.0-5.0.51a/debian/po/pt.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/ru.po mysql-dfsg-5.0-5.0.51a/debian/po/ru.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/es.po mysql-dfsg-5.0-5.0.51a/debian/po/es.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/cs.po mysql-dfsg-5.0-5.0.51a/debian/po/cs.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/ro.po mysql-dfsg-5.0-5.0.51a/debian/po/ro.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/pt_BR.po mysql-dfsg-5.0-5.0.51a/debian/po/pt_BR.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/eu.po mysql-dfsg-5.0-5.0.51a/debian/po/eu.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/templates.pot mysql-dfsg-5.0-5.0.51a/debian/po/templates.pot diff -u mysql-dfsg-5.0-5.0.51a/debian/po/ca.po mysql-dfsg-5.0-5.0.51a/debian/po/ca.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/fi.po mysql-dfsg-5.0-5.0.51a/debian/po/fi.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/gl.po mysql-dfsg-5.0-5.0.51a/debian/po/gl.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/tr.po mysql-dfsg-5.0-5.0.51a/debian/po/tr.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/de.po mysql-dfsg-5.0-5.0.51a/debian/po/de.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/fr.po mysql-dfsg-5.0-5.0.51a/debian/po/fr.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/it.po mysql-dfsg-5.0-5.0.51a/debian/po/it.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/ja.po mysql-dfsg-5.0-5.0.51a/debian/po/ja.po diff -u mysql-dfsg-5.0-5.0.51a/debian/po/nl.po mysql-dfsg-5.0-5.0.51a/debian/po/nl.po