Author: jsuchome Date: Tue Nov 25 13:27:53 2008 New Revision: 53573 URL: http://svn.opensuse.org/viewcvs/yast?rev=53573&view=rev Log: - installation: do not reset root password when modifying 1st user settings (bnc#445512) - 2.17.26 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/inst_user_first.ycp trunk/users/src/users_proposal.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=53573&r1=53572&r2=53573&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Tue Nov 25 13:27:53 2008 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=53573&r1=53572&r2=53573&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Tue Nov 25 13:27:53 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 25 10:38:49 CET 2008 - jsuchome@suse.cz + +- installation: do not reset root password when modifying 1st user + settings (bnc#445512) +- 2.17.26 + +------------------------------------------------------------------- Fri Nov 14 15:15:40 CET 2008 - jsuchome@suse.cz - do not use Wizard::OpenOKDialog together with hiding Abort button Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?rev=53573&r1=53572&r2=53573&view=diff ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Tue Nov 25 13:27:53 2008 @@ -523,6 +523,9 @@ root_pw = true; y2debug ("root_pw default value: %1", root_pw); } + map args = GetInstArgs::argmap (); + // indication that client was called directly from proposal + boolean root_dialog_follows = args["root_dialog_follows"]:true; // this user gets root's mail boolean root_mail = @@ -765,7 +768,8 @@ }); UsersSimple::SetUsers (create_users); UsersSimple::SkipRootPasswordDialog (false); - UsersSimple::SetRootPassword (""); + if (root_dialog_follows) + UsersSimple::SetRootPassword (""); UsersSimple::SetAutologinUser (""); UsersSimple::SetRootAlias (""); } @@ -779,7 +783,9 @@ ]; UsersSimple::SetUsers ([user_map]); UsersSimple::SkipRootPasswordDialog (root_pw); - UsersSimple::SetRootPassword (root_pw ? password : ""); + if (root_dialog_follows || root_pw) + UsersSimple::SetRootPassword (root_pw ? password : ""); + UsersSimple::SetAutologinUser ( (UI::QueryWidget(`id (`autologin),`Value)==true) ? username : "" ); Modified: trunk/users/src/users_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_proposal.ycp?rev=53573&r1=53572&r2=53573&view=diff ============================================================================== --- trunk/users/src/users_proposal.ycp (original) +++ trunk/users/src/users_proposal.ycp Tue Nov 25 13:27:53 2008 @@ -132,7 +132,10 @@ result = (symbol)WFM::CallFunction ("inst_root_first", [args]); } else + { + args["root_dialog_follows"] = false; result = (symbol)WFM::CallFunction ("inst_user_first", [args]); + } Wizard::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org