summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-16 16:33:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-16 16:33:56 +0000
commit5a5cadc58c1711c3a3019fc284a6010b24af1471 (patch)
tree13358a3cf029799a5414610032f0863d784cc337
parentd2780ff97a2bac9c62ba8c2abd2ccdfb0ccf6b52 (diff)
downloaddrakx-5a5cadc58c1711c3a3019fc284a6010b24af1471.tar
drakx-5a5cadc58c1711c3a3019fc284a6010b24af1471.tar.gz
drakx-5a5cadc58c1711c3a3019fc284a6010b24af1471.tar.bz2
drakx-5a5cadc58c1711c3a3019fc284a6010b24af1471.tar.xz
drakx-5a5cadc58c1711c3a3019fc284a6010b24af1471.zip
no_comment
-rw-r--r--docs/TODO2
-rw-r--r--perl-install/ChangeLog7
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/mouse.pm4
5 files changed, 14 insertions, 3 deletions
diff --git a/docs/TODO b/docs/TODO
index f23d96dd9..6fb2ebb07 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -86,6 +86,8 @@ auto ppp-configure with free provider
-easy fixes-----------------------------------------------------------------------------
+add choice clean /tmp or not in expert
+
in ok_cancel, focus has 3 states, should be 2 (ask dindinx)
configure DHCP for newbies if ethernet & DHCP card available
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 7a1d082c7..714758bd8 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,10 @@
+2000-02-16 Pixel <pixel@mandrakesoft.com>
+
+ * mouse.pm (detect): add defaults to serial mouse
+
+ * install_steps_gtk.pm (createXconf): remove the defaults to
+ serial mouse
+
2000-02-15 Pixel <pixel@mandrakesoft.com>
* diskdrake.pm: "After %s partition %s," inlined otherwise does
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index f02f65996..68846bcaa 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -595,7 +595,7 @@ sub main {
#- needed very early for install_steps_gtk
eval { ($o->{mouse}, $o->{wacom}) = mouse::detect() } unless $o->{nomouseprobe} || $o->{mouse};
-
+
$::o = $o = $::auto_install ?
install_steps_auto_install->new($o) :
$o->{interactive} eq "stdio" ?
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 0b8303954..cd08affd1 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -775,8 +775,6 @@ sub create_logo_window() {
#------------------------------------------------------------------------------
sub createXconf($$$) {
my ($file, $mouse_type, $mouse_dev, $wacom_dev) = @_;
- $mouse_type ||= "Microsoft";
- $mouse_dev = devices::make($mouse_dev || "ttyS0");
my $wacom;
if ($wacom_dev) {
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index cf21d68fb..0750efe0d 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -127,5 +127,9 @@ sub detect() {
do { $wacom or modules::unload("serial"); return name2mouse("USB Mouse"), $wacom } if !$@ && detect_devices::tryOpen("usbmouse");
modules::unload($c->[1], 'remove_alias');
}
+
+ #- defaults to generic ttyS0
+ add2hash(name2mouse("Generic Mouse (serial)"), { device => "ttyS0", unsafe => 1 });
+
die "mouseconfig failed";
}