summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-30 21:34:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-30 21:34:52 +0000
commit6d78ac32d9e302ac73ec39c864d66b52212531b2 (patch)
treeed7c51deb7fb82458333250f751cef4f59bb562e /perl-install
parent466b93aa08e8e19def5fce6f69f684030f85b635 (diff)
downloaddrakx-6d78ac32d9e302ac73ec39c864d66b52212531b2.tar
drakx-6d78ac32d9e302ac73ec39c864d66b52212531b2.tar.gz
drakx-6d78ac32d9e302ac73ec39c864d66b52212531b2.tar.bz2
drakx-6d78ac32d9e302ac73ec39c864d66b52212531b2.tar.xz
drakx-6d78ac32d9e302ac73ec39c864d66b52212531b2.zip
disable gpm (in case of serial mouse) before service choice
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Xconfigurator.pm1
-rw-r--r--perl-install/install_steps.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 9bc685986..c37c3d39a 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1475,7 +1475,6 @@ _("I can set up your computer to automatically start X upon booting.
Would you like X to start when you reboot?"), 1);
any::runlevel($prefix, $run ? 5 : 3) unless $::testing;
}
- run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
}
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index bc70fc3d8..5089beca0 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -413,6 +413,8 @@ Consoles 1,3,4,7 may also contain interesting information";
run_program::rooted($o->{prefix}, "chkconfig", "--add", $_) foreach
qw(random netfs network rawdevices sound kheader usb keytable syslog crond portmap);
+ run_program::rooted($o->{prefix}, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/;
+
#- call update-menus at the end of package installation
run_program::rooted($o->{prefix}, "update-menus");