Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-07-30 07:34:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2014-07-27 08:26:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-07-30 07:34:48.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 28 15:38:59 CEST 2014 - schubi@suse.de + +- Set the correct runlevel while autyast installation (bnc#889055) +- 3.1.52 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.51.tar.bz2 New: ---- autoyast2-3.1.52.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.42zfhK/_old 2014-07-30 07:34:50.000000000 +0200 +++ /var/tmp/diff_new_pack.42zfhK/_new 2014-07-30 07:34:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.51 +Version: 3.1.52 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.51.tar.bz2 -> autoyast2-3.1.52.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.51/package/autoyast2.changes new/autoyast2-3.1.52/package/autoyast2.changes --- old/autoyast2-3.1.51/package/autoyast2.changes 2014-07-25 14:10:09.000000000 +0200 +++ new/autoyast2-3.1.52/package/autoyast2.changes 2014-07-29 08:40:45.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 28 15:38:59 CEST 2014 - schubi@suse.de + +- Set the correct runlevel while autyast installation (bnc#889055) +- 3.1.52 + +------------------------------------------------------------------- Fri Jul 25 12:00:17 UTC 2014 - jsrain@suse.cz - code de-duplication of recent bootloader autoupgrde changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.51/package/autoyast2.spec new/autoyast2-3.1.52/package/autoyast2.spec --- old/autoyast2-3.1.51/package/autoyast2.spec 2014-07-25 14:10:09.000000000 +0200 +++ new/autoyast2-3.1.52/package/autoyast2.spec 2014-07-29 08:40:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.51 +Version: 3.1.52 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.51/src/clients/inst_autosetup.rb new/autoyast2-3.1.52/src/clients/inst_autosetup.rb --- old/autoyast2-3.1.51/src/clients/inst_autosetup.rb 2014-07-25 14:10:09.000000000 +0200 +++ new/autoyast2-3.1.52/src/clients/inst_autosetup.rb 2014-07-29 08:40:45.000000000 +0200 @@ -328,17 +328,22 @@ Progress.NextStage - if Profile.current['runlevel'] && Profile.current['runlevel']['default'] - default_runlevel = Profile.current['runlevel']['default'].to_i - @default_target = default_runlevel == 5 ? Target::GRAPHICAL : Target::MULTIUSER - Builtins.y2milestone("Accepting runlevel '#{default_runlevel}' as default target '#{@default_target}'") - else - @default_target = Profile.current['default_target'].to_s + #still supporting old format "runlevel" + if Profile.current['runlevel'] + if Profile.current['runlevel']['default'] + default_runlevel = Profile.current['runlevel']['default'].to_i + @default_target = default_runlevel == 5 ? Target::GRAPHICAL : Target::MULTIUSER + Builtins.y2milestone("Accepting runlevel '#{default_runlevel}' as default target '#{@default_target}'") + elsif Profile.current['runlevel']['default_target'] + @default_target = Profile.current['runlevel']['default_target'].to_s + end + elsif Profile.current['services-manager'] &&Profile.current['services-manager']['default_target'] + @default_target = Profile.current['services-manager']['default_target'].to_s end Builtins.y2milestone("autoyast - configured default target: '#{@default_target}'") - if !@default_target.empty? + if @default_target && !@default_target.empty? ServicesManagerTarget.default_target = @default_target else ServicesManagerTarget.default_target = Installation.x11_setup_needed && -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org