summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-12-02 15:03:43 +0000
committerFrancois Pons <fpons@mandriva.com>1999-12-02 15:03:43 +0000
commitf0cee665246a89d69530d4100da0274d56b8f5ec (patch)
tree35f5401c275c0d9279d4f3e0f91ac99d147f8e55
parent7150824031e79b1cc1f5c9accd181b8b0488eaff (diff)
downloaddrakx-backup-do-not-use-f0cee665246a89d69530d4100da0274d56b8f5ec.tar
drakx-backup-do-not-use-f0cee665246a89d69530d4100da0274d56b8f5ec.tar.gz
drakx-backup-do-not-use-f0cee665246a89d69530d4100da0274d56b8f5ec.tar.bz2
drakx-backup-do-not-use-f0cee665246a89d69530d4100da0274d56b8f5ec.tar.xz
drakx-backup-do-not-use-f0cee665246a89d69530d4100da0274d56b8f5ec.zip
*** empty log message ***
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/install_steps_interactive.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 89c54cfd1..ab5257684 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -120,7 +120,7 @@ get_needed_files: $(DIRS)
cp -a keymaps $(DEST)/usr/share
cp -a consolefonts $(DEST)/usr/share
- cp *.in modparm.lst $(DEST)/usr/share
+ cp template.in/*.in modparm.lst $(DEST)/usr/share
cp MonitorsDB $(DEST)/usr/X11R6/lib/X11
cp logo-mandrake.xpm $(DEST)/usr/share
cp -a themes $(DEST)/usr/share/gtk
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index b0ebd1216..2254b5fcc 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -377,7 +377,7 @@ sub pppConfig {
unless ($m->{device} || $::expert && !$o->ask_yesorno('', _("Try to find a modem?"), 1)) {
foreach (0..3) {
- next if readlink("$o->{prefix}/dev/mouse") =~ /ttyS$_/;
+ next if $o->{mouse}{device} =~ /ttyS$_/;
detect_devices::hasModem("$o->{prefix}/dev/ttyS$_")
and $m->{device} = "ttyS$_", last;
}