diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-01-06 14:55:03 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-01-06 14:55:03 +0000 |
| commit | 34723518535dbc9e1dd3e7135cec1a66dc4dacae (patch) | |
| tree | 97576c2d0941c36b9800a6a6de0a663714b15aa2 | |
| parent | 7424db95aa9255b44a5d54953b0c28fd63409cd1 (diff) | |
| download | drakx-backup-do-not-use-34723518535dbc9e1dd3e7135cec1a66dc4dacae.tar drakx-backup-do-not-use-34723518535dbc9e1dd3e7135cec1a66dc4dacae.tar.gz drakx-backup-do-not-use-34723518535dbc9e1dd3e7135cec1a66dc4dacae.tar.bz2 drakx-backup-do-not-use-34723518535dbc9e1dd3e7135cec1a66dc4dacae.tar.xz drakx-backup-do-not-use-34723518535dbc9e1dd3e7135cec1a66dc4dacae.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_steps.pm | 8 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index f628ff7fa..7d93a6bd6 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -242,6 +242,14 @@ sub afterInstallPackages($) { #- remove the nasty acon... run_program::rooted($o->{prefix}, "chkconfig", "--del", "acon") unless $ENV{LANGUAGE} =~ /ar/; + #- create /etc/sysconfig/desktop file according to user choice and presence of /usr/bin/kdm or /usr/bin/gdm. + my $f = "$o->{prefix}/etc/sysconfig/desktop"; + if ($o->{compssUsersChoice}{KDE} && -x "$o->{prefix}/usr/bin/kdm") { + output($f, "KDE\n"); + } elsif ($o->{compssUsersChoice}{Gnome} && -x "$o->{prefix}/usr/bin/gdm") { + output($f, "GNOME\n"); + } + if ($o->{pcmcia}) { substInFile { s/.*(TaskBarShowAPMStatus).*/$1=1/ } "$o->{prefix}/usr/lib/X11/icewm/preferences"; eval { commands::cp("$o->{prefix}/usr/share/applnk/System/kapm.kdelnk", diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 8807e0a6a..6878b828e 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -301,9 +301,6 @@ sub chooseGroups { delete $_->{skip}; } } - my $f = "$o->{prefix}/etc/sysconfig/desktop"; - output($f, "GNOME\n") if $o->{compssUsersChoice}{Gnome}; - output($f, "KDE\n") if $o->{compssUsersChoice}{KDE}; } #------------------------------------------------------------------------------ |