diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-09-23 17:29:32 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-09-23 17:29:32 +0000 |
| commit | 14899e18b71931cfdff94b4ee1e5d69c504a7a44 (patch) | |
| tree | 710d075fb2c625dd87b6e113a53a21f8ea0dfa81 /perl-install/any.pm | |
| parent | 25d0ea4b89d0ba1471bd4b4a3329b8d940115ef8 (diff) | |
| download | drakx-14899e18b71931cfdff94b4ee1e5d69c504a7a44.tar drakx-14899e18b71931cfdff94b4ee1e5d69c504a7a44.tar.gz drakx-14899e18b71931cfdff94b4ee1e5d69c504a7a44.tar.bz2 drakx-14899e18b71931cfdff94b4ee1e5d69c504a7a44.tar.xz drakx-14899e18b71931cfdff94b4ee1e5d69c504a7a44.zip | |
always write /etc/sysconfig/desktop
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index e4a69ec9d..be9cf994c 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -700,6 +700,11 @@ sub set_autologin { unlink $xdm_autologin_cfg; } + my $sys_conffile = "$::prefix/etc/sysconfig/desktop"; + my %desktop = getVarsFromSh($sys_conffile); + $desktop{DESKTOP} = $autologin->{desktop}; + setVarsInSh($sys_conffile, \%desktop); + if ($autologin->{user}) { my $home = (getpwnam($autologin->{user}))[7]; set_window_manager($home, $autologin->{desktop}); @@ -723,10 +728,6 @@ sub set_window_manager { $l{DESKTOP} = $wm; setVarsInSh("$p_home/.desktop", \%l); } - my $sys_conffile = "$::prefix/etc/sysconfig/desktop"; - my %desktop = getVarsFromSh($sys_conffile); - $desktop{DESKTOP} = $wm; - setVarsInSh($sys_conffile, \%desktop); } sub rotate_log { |