Author: locilka Date: Mon Jun 2 12:40:37 2008 New Revision: 47984

URL: http://svn.opensuse.org/viewcvs/yast?rev=47984&view=rev Log: - Return `next when going back to the automatic configuration dialog instead of returning `auto that would finish YaST and never start it again (bnc #395098). - 2.16.49

Modified: branches/SuSE-Linux-11_0-Branch/installation/VERSION branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes branches/SuSE-Linux-11_0-Branch/installation/src/clients/inst_automatic_configuration.ycp

Modified: branches/SuSE-Linux-11_0-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/install... ============================================================================== --- branches/SuSE-Linux-11_0-Branch/installation/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/installation/VERSION Mon Jun 2 12:40:37 2008 @@ -1 +1 @@ -2.16.48 +2.16.49

Modified: branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/install... ============================================================================== --- branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes Mon Jun 2 12:40:37 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jun 2 12:33:57 CEST 2008 - locilka@suse.cz + +- Return `next when going back to the automatic configuration + dialog instead of returning `auto that would finish YaST and + never start it again (bnc #395098). +- 2.16.49 + +------------------------------------------------------------------- Wed May 28 16:23:22 CEST 2008 - ug@suse.de

- timeout in case of hardware probing problems

Modified: branches/SuSE-Linux-11_0-Branch/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/install... ============================================================================== --- branches/SuSE-Linux-11_0-Branch/installation/src/clients/inst_automatic_configuration.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/installation/src/clients/inst_automatic_configuration.ycp Mon Jun 2 12:40:37 2008 @@ -21,8 +21,11 @@ textdomain "installation";

if (GetInstArgs::going_back()) { - y2milestone ("Going back, nothing to do here..."); - return `auto; + // bnc #395098 + // There is no reason to go back as AC is non-interactive + // and additionally there is nothing before AC to run + y2milestone ("Returning `next, no reason to go back"); + return `next; }

boolean test_mode = false;