diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-22 13:39:14 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-22 13:39:14 +0000 |
| commit | 9a69bb42e894a59f0af533851a3bc8e1ef792b2d (patch) | |
| tree | f23ab3ab1f87dc63b9503fe9116be3d56362a0cb | |
| parent | c07319bb05edd59018e73644d2039a11e7acb9f5 (diff) | |
| download | drakx-backup-do-not-use-9a69bb42e894a59f0af533851a3bc8e1ef792b2d.tar drakx-backup-do-not-use-9a69bb42e894a59f0af533851a3bc8e1ef792b2d.tar.gz drakx-backup-do-not-use-9a69bb42e894a59f0af533851a3bc8e1ef792b2d.tar.bz2 drakx-backup-do-not-use-9a69bb42e894a59f0af533851a3bc8e1ef792b2d.tar.xz drakx-backup-do-not-use-9a69bb42e894a59f0af533851a3bc8e1ef792b2d.zip | |
- use modules::mergein_conf so that USB availability test works
- adapt to changed prototype mouse::write_conf
| -rwxr-xr-x | perl-install/standalone/mousedrake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index 71841f882..06faca069 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -20,6 +20,8 @@ $::testing = /-testing/; my $in = 'interactive'->vnew('su', 'mouse'); +modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; + undef $::Plug; begin: my $mouse = mouse::read(); @@ -49,7 +51,6 @@ if (!$mouse || !$::auto) { $mouse = $mouse_chosen if !($mouse->{type} eq $mouse_chosen->{type} && $mouse->{name} eq $mouse_chosen->{name}); if ($mouse->{device} eq "usbmouse") { - modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; modules::load_category('bus/usb') or die 'no usb bus found\n'; modules::load(qw(hid mousedev usbmouse)); } @@ -64,7 +65,7 @@ if (!$mouse || !$::auto) { ) || goto begin if $mouse->{type} eq 'serial'; } -mouse::write_conf($mouse, 1); +mouse::write_conf($in, $mouse, 1); system('service', 'gpm', 'restart') if -e '/var/lock/subsys/gpm'; $::isEmbedded ? kill('USR1', $::CCPID) : $in->exit(0); |