Author: jsuchome Date: Mon Jan 11 10:10:48 2010 New Revision: 60303 URL: http://svn.opensuse.org/viewcvs/yast?rev=60303&view=rev Log: - set the displaymanager only when respective package is installed (bnc#538998) - 2.19.2 Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/firstboot_write.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=60303&r1=60302&r2=60303&view=diff ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Mon Jan 11 10:10:48 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboot.changes?rev=60303&r1=60302&r2=60303&view=diff ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Mon Jan 11 10:10:48 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 11 10:02:39 CET 2010 - jsuchome@suse.cz + +- set the displaymanager only when respective package is installed + (bnc#538998) +- 2.19.2 + +------------------------------------------------------------------- Thu Jan 7 14:34:43 CET 2010 - jsuchome@suse.cz - added firstboot_licenses step able to show 2 license texts Modified: trunk/firstboot/src/firstboot_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_write.ycp?rev=60303&r1=60302&r2=60303&view=diff ============================================================================== --- trunk/firstboot/src/firstboot_write.ycp (original) +++ trunk/firstboot/src/firstboot_write.ycp Mon Jan 11 10:10:48 2010 @@ -12,6 +12,7 @@ import "FileUtils"; import "Firstboot"; import "Keyboard"; + import "Package"; import "Popup"; import "Progress"; import "Wizard"; @@ -63,9 +64,11 @@ { default_dm = "gdm"; } - SCR::Write( - .sysconfig.displaymanager.DISPLAYMANAGER, default_dm - ); + if ((default_dm == "kdm" && Package::Installed ("kdm")) || + (default_dm == "gdm" && Package::Installed ("gdm"))) + { + SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER, default_dm); + } SCR::Write( .sysconfig.windowmanager.DEFAULT_WM, Firstboot::default_wm ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org