summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-04 07:56:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-04 07:56:15 +0000
commit44a257eb1cd8e437195c42dd42db45c3c4e70495 (patch)
treebd1ebb718d1344449383e2749d0b0ef6748548ed
parent531df1b5a44d44f21d983c1278829943fee9db77 (diff)
downloaddrakx-44a257eb1cd8e437195c42dd42db45c3c4e70495.tar
drakx-44a257eb1cd8e437195c42dd42db45c3c4e70495.tar.gz
drakx-44a257eb1cd8e437195c42dd42db45c3c4e70495.tar.bz2
drakx-44a257eb1cd8e437195c42dd42db45c3c4e70495.tar.xz
drakx-44a257eb1cd8e437195c42dd42db45c3c4e70495.zip
.gnome2/wmrc and .wmrc are obsolete, it is now .dmrc
(nb: beware, one must write 07IceWM instead of IceWM, same for others)
-rw-r--r--perl-install/any.pm15
1 files changed, 8 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 736c58a5e..5017ac753 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -443,14 +443,11 @@ sub set_window_manager {
my ($home, $wm) = @_;
my $p_home = "$::prefix$home";
- #- for KDM
- output("$p_home/.wmrc", "$wm\n");
+ #- for KDM/GDM
+ my $wm_number = sessions_with_order()->{$wm} || '';
+ update_gnomekderc("$p_home/.dmrc", 'Desktop', Session => "$wm_number$wm");
- #- for GDM
- mkdir_p("$p_home/.gnome2");
- update_gnomekderc("$p_home/.gnome2/gdm", 'session', last => $wm);
-
- #- for startx
+ #- for startx/autologin
{
my %l = getVarsFromSh("$p_home/.desktop");
$l{DESKTOP} = $wm;
@@ -591,6 +588,10 @@ sub ask_users {
sub sessions() {
split(' ', run_program::rooted_get_stdout($::prefix, '/usr/sbin/chksession', '-l'));
}
+sub sessions_with_order() {
+ my %h = map { /(.*)=(.*)/ } split(' ', run_program::rooted_get_stdout($::prefix, '/usr/sbin/chksession', '-L'));
+ \%h;
+}
sub autologin {
my ($o, $in) = @_;