Author: jsuchome Date: Thu Feb 17 11:10:13 2011 New Revision: 63435 URL: http://svn.opensuse.org/viewcvs/yast?rev=63435&view=rev Log: - do not run both 'user' and 'user_non_interactive' steps (bnc#672139) - 2.20.2 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=63435&r1=63434&r2=63435&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu Feb 17 11:10:13 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=63435&r1=63434&r2=63435&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu Feb 17 11:10:13 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 17 10:59:38 CET 2011 - jsuchome@suse.cz + +- do not run both 'user' and 'user_non_interactive' steps + (bnc#672139) +- 2.20.2 + +------------------------------------------------------------------- Fri Dec 3 12:41:56 CET 2010 - jsuchome@suse.cz - when user is disabled, disable its autologin (bnc#653559) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=63435&r1=63434&r2=63435&view=diff ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Thu Feb 17 11:10:13 2011 @@ -918,12 +918,16 @@ } # enable inst_user to either run auth client or write first user if ($after_auth ne "users" || $user_defined) { - y2milestone ("enabling step 'user' for second stage"); + # do not let both steps to run (bnc#672139) if ($user_defined) { + y2milestone ("enabling 'user_non_interactive', disabling 'user' for second stage"); ProductControl->EnableModule ("user_non_interactive"); + ProductControl->DisableModule ("user"); } else { + y2milestone ("enabling 'user', disabling 'user_non_interactive' for second stage"); ProductControl->EnableModule ("user"); + ProductControl->DisableModule ("user_non_interactive"); } } # no user entered + 2nd stage visible => enable clients (bnc#393722) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org