diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-04-25 18:32:02 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-04-25 18:32:02 +0000 |
| commit | 7039b28e9cc76fd602016a10c0927b40fc960b58 (patch) | |
| tree | e22ba025b70d5d53be217acd07bb897a532273b5 | |
| parent | 25946f2b1829f207aab844f3464ce515a50f15cc (diff) | |
| download | drakx-backup-do-not-use-7039b28e9cc76fd602016a10c0927b40fc960b58.tar drakx-backup-do-not-use-7039b28e9cc76fd602016a10c0927b40fc960b58.tar.gz drakx-backup-do-not-use-7039b28e9cc76fd602016a10c0927b40fc960b58.tar.bz2 drakx-backup-do-not-use-7039b28e9cc76fd602016a10c0927b40fc960b58.tar.xz drakx-backup-do-not-use-7039b28e9cc76fd602016a10c0927b40fc960b58.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install2.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 8073a340a..ca4d18cd3 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -561,9 +561,8 @@ sub main { } unless ($::testing) { - unlink $_ foreach ( - "/sbin/insmod", "/sbin/rmmod", "/sbin/install", - "/modules/modules.cgz", + unlink $_ foreach ( $o->{pcmcia} ? () : ("/sbin/install", "/modules/modules.cgz"), + "/sbin/insmod", "/sbin/rmmod", "/modules/pcmcia_core.o", #- always use module from archive. "/modules/i82365.o", "/modules/tcic.o", diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index c79b8aed6..56e7774f9 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -497,7 +497,7 @@ sub pppConfig { $m->{device} ||= $o->set_help('selectSerialPort') && mouse::serial_ports_names2dev( $o->ask_from_list('', _("Please choose which serial port your modem is connected to."), - [ grep { my $avoidDevice = mouse::serial_ports_name2dev($_); + [ grep { my $avoidDevice = mouse::serial_ports_names2dev($_); $o->{mouse}{device} !~ /$avoidDevice/ } mouse::serial_ports_names ])); $o->set_help('configureNetworkISP'); |