Author: jsuchome Date: Mon Apr 28 14:49:18 2008 New Revision: 47107 URL: http://svn.opensuse.org/viewcvs/yast?rev=47107&view=rev Log: - Autologin: kdm3/kdm4 values as DISPLAYMANAGER, no SuSEconfig.kdm - 2.16.2 Modified: trunk/pam/VERSION trunk/pam/package/yast2-pam.changes trunk/pam/src/Autologin.ycp Modified: trunk/pam/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/VERSION?rev=47107&r1=4710... ============================================================================== --- trunk/pam/VERSION (original) +++ trunk/pam/VERSION Mon Apr 28 14:49:18 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/pam/package/yast2-pam.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/package/yast2-pam.changes?rev... ============================================================================== --- trunk/pam/package/yast2-pam.changes (original) +++ trunk/pam/package/yast2-pam.changes Mon Apr 28 14:49:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 28 11:29:02 CEST 2008 - jsuchome@suse.cz + +- Autologin: kdm3/kdm4 values as DISPLAYMANAGER, no SuSEconfig.kdm +- 2.16.2 + +------------------------------------------------------------------- Thu Mar 27 15:31:47 CET 2008 - jsuchome@suse.cz - kdm could be in kde4-kdm package Modified: trunk/pam/src/Autologin.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/src/Autologin.ycp?rev=47107&a... ============================================================================== --- trunk/pam/src/Autologin.ycp (original) +++ trunk/pam/src/Autologin.ycp Mon Apr 28 14:49:18 2008 @@ -61,8 +61,11 @@ } string dm = (string) SCR::Read (.sysconfig.displaymanager.DISPLAYMANAGER); - if ((dm == "kdm" && Package::InstalledAny (["kdebase3-kdm", "kde4-kdm"])) || - dm == "gdm" && Package::Installed ("gdm")) + if ((issubstring (dm, "kdm") && + Package::InstalledAny (["kdebase3-kdm", "kde4-kdm"])) + || + (dm == "gdm" && Package::Installed ("gdm")) + ) { available = true; user = (string) SCR::Read (.sysconfig.displaymanager.DISPLAYMANAGER_AUTOLOGIN); @@ -99,8 +102,8 @@ if (!write_only) { string dm = (string)SCR::Read(.sysconfig.displaymanager.DISPLAYMANAGER); - string mod = (dm == "gdm") ? dm : "kdm3"; - SCR::Execute (.target.bash, "/sbin/SuSEconfig --module " + mod); + if (dm == "gdm") + SCR::Execute (.target.bash, "/sbin/SuSEconfig --module gdm"); } modified = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org