Author: jsuchome Date: Fri Apr 11 09:16:23 2008 New Revision: 46381 URL: http://svn.opensuse.org/viewcvs/yast?rev=46381&view=rev Log: - better fix of bnc#373654: read system settings in inst_user (first system, than user!) Modified: trunk/users/package/yast2-users.changes trunk/users/src/inst_root.ycp trunk/users/src/inst_user.ycp Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=46381&r1=46380&r2=46381&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Apr 11 09:16:23 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 11 09:13:47 CEST 2008 - jsuchome@suse.cz + +- better fix of bnc#373654: read system settings in inst_user + +------------------------------------------------------------------- Mon Apr 7 13:38:19 CEST 2008 - jsuchome@suse.cz - import the user settings before reading system ones (bnc#373654) Modified: trunk/users/src/inst_root.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_root.ycp?rev=46381&r1=46380&r2=46381&view=diff ============================================================================== --- trunk/users/src/inst_root.ycp (original) +++ trunk/users/src/inst_root.ycp Fri Apr 11 09:16:23 2008 @@ -37,15 +37,6 @@ Users::ReadSystemDefaults (); UsersSimple::Read (); - if (!GetInstArgs::going_back() && UsersSimple::RootPasswordWritten ()) - { - y2milestone ("root password was already written..."); - // write encryption method (makes sense even if no local user is set) - Users::SetEncryptionMethod (UsersSimple::EncryptionMethod ()); - Users::WriteSecurity (); - return `auto; - } - boolean check_CA_constraints = ProductFeatures::GetBooleanFeature ("globals","root_password_ca_check"); @@ -56,7 +47,7 @@ boolean this_is_for_real = ! Mode::test (); - string encryptionMethod = Users::EncryptionMethod (); + string encryptionMethod = UsersSimple::EncryptionMethod (); // Title for root-password dialogue string title = _("Password for the System Administrator \"root\""); Modified: trunk/users/src/inst_user.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user.ycp?rev=46381&r1=46380&r2=46381&view=diff ============================================================================== --- trunk/users/src/inst_user.ycp (original) +++ trunk/users/src/inst_user.ycp Fri Apr 11 09:16:23 2008 @@ -29,7 +29,12 @@ symbol ret = `back; if (!GetInstArgs::going_back()) + { + Users::ReadSystemDefaults (); UsersSimple::Read (); + Users::SetEncryptionMethod (UsersSimple::EncryptionMethod ()); + Users::WriteSecurity (); + } // check if the user was configured in the 1st stage if (!GetInstArgs::going_back() && -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org