Attachment 7399 Details for Bug 17616 – A patch to add support for configuring /etc/lxdm/lxdm.conf

[patch] A patch to add support for configuring /etc/lxdm/lxdm.conf

drakxtools-17.16-lxdm.patch (text/plain), 1.78 KB, created by Nicolas Salguero on 2016-02-02 13:39:29 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Salguero

Created: 2016-02-02 13:39:29 CET

Size: 1.78 KB

patch

obsolete

>diff -ruN drakxtools-17.16/perl-install/any.pm drakxtools-17.16.new/perl-install/any.pm
>--- drakxtools-17.16/perl-install/any.pm	2016-01-25 01:41:41.000000000 +0100
>+++ drakxtools-17.16.new/perl-install/any.pm	2016-02-02 13:09:55.558520886 +0100
>@@ -653,6 +653,7 @@
>     my $gdm_file = "$::prefix/etc/X11/gdm/custom.conf";
>     my $kdm_file = common::read_alternative('kdm4-config');
>     my $lightdm_conffile = "$::prefix/etc/lightdm/lightdm.conf.d/50-mageia-autologin.conf";
>+    my $lxdm_conffile = "$::prefix/etc/lxdm/lxdm.conf";
>     my $autologin_file = "$::prefix/etc/sysconfig/autologin";
>     my $desktop = $desktop{DESKTOP} || first(sessions());
>     my %desktop_to_dm = (
>@@ -681,6 +682,9 @@
>     } elsif ($dm eq "lightdm") {
>         my %conf = read_gnomekderc($lightdm_conffile, 'Seat:*');
>         $autologin_user = text2bool($conf{'#dummy-autologin'}) && $conf{"autologin-user"};
>+    } elsif ($dm eq "lxdm") {
>+        my %conf = read_gnomekderc($lxdm_conffile, 'base');
>+        $autologin_user = $conf{"autologin"};
>     } else {
>         my %conf = getVarsFromSh($autologin_file);
>         $autologin_user = text2bool($conf{AUTOLOGIN}) && $conf{USER};
>@@ -728,8 +732,13 @@
> 	'autologin-user' => $autologin->{user}
>     )) } if -e $lightdm_conffile;
> 
>+    #- Configure LXDM
>+    my $lxdm_conffile = "$::prefix/etc/lxdm/lxdm.conf";
>+    eval { update_gnomekderc($lxdm_conffile, 'base' => (
>+	'autologin' => $autologin->{user}
>+    )) } if -e $lxdm_conffile;
>+
>     my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin";
>-    # TODO: configure lxdm in /etx/lxdm/lxdm.conf
>     if (is_standalone_autologin_needed($autologin->{dm})) {
> 	setVarsInShMode($xdm_autologin_cfg, 0644,
> 			{ USER => $autologin->{user}, AUTOLOGIN => bool2yesno($autologin->{user}), EXEC => '/usr/bin/startx.autologin' });

diff -ruN drakxtools-17.16/perl-install/any.pm drakxtools-17.16.new/perl-install/any.pm
--- drakxtools-17.16/perl-install/any.pm	2016-01-25 01:41:41.000000000 +0100
+++ drakxtools-17.16.new/perl-install/any.pm	2016-02-02 13:09:55.558520886 +0100
@@ -653,6 +653,7 @@
     my $gdm_file = "$::prefix/etc/X11/gdm/custom.conf";
     my $kdm_file = common::read_alternative('kdm4-config');
     my $lightdm_conffile = "$::prefix/etc/lightdm/lightdm.conf.d/50-mageia-autologin.conf";
+    my $lxdm_conffile = "$::prefix/etc/lxdm/lxdm.conf";
     my $autologin_file = "$::prefix/etc/sysconfig/autologin";
     my $desktop = $desktop{DESKTOP} || first(sessions());
     my %desktop_to_dm = (
@@ -681,6 +682,9 @@
     } elsif ($dm eq "lightdm") {
         my %conf = read_gnomekderc($lightdm_conffile, 'Seat:*');
         $autologin_user = text2bool($conf{'#dummy-autologin'}) && $conf{"autologin-user"};
+    } elsif ($dm eq "lxdm") {
+        my %conf = read_gnomekderc($lxdm_conffile, 'base');
+        $autologin_user = $conf{"autologin"};
     } else {
         my %conf = getVarsFromSh($autologin_file);
         $autologin_user = text2bool($conf{AUTOLOGIN}) && $conf{USER};
@@ -728,8 +732,13 @@
 	'autologin-user' => $autologin->{user}
     )) } if -e $lightdm_conffile;
 
+    #- Configure LXDM
+    my $lxdm_conffile = "$::prefix/etc/lxdm/lxdm.conf";
+    eval { update_gnomekderc($lxdm_conffile, 'base' => (
+	'autologin' => $autologin->{user}
+    )) } if -e $lxdm_conffile;
+
     my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin";
-    # TODO: configure lxdm in /etx/lxdm/lxdm.conf
     if (is_standalone_autologin_needed($autologin->{dm})) {
 	setVarsInShMode($xdm_autologin_cfg, 0644,
 			{ USER => $autologin->{user}, AUTOLOGIN => bool2yesno($autologin->{user}), EXEC => '/usr/bin/startx.autologin' });

Actions: View | Diff

Attachments on bug 17616: 7399 | 7405 | 7406 | 8342 | 8343 | 8632