diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-03 13:24:32 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-03 13:24:32 +0000 |
| commit | 8f5d72a12b4488f3007c73537d5212b6b67cadce (patch) | |
| tree | bd76dac0f42c1d3e08c55d03b777741868a72fba | |
| parent | 0f91e019e84e1cc55b224ebb4b81eccaf63eecbe (diff) | |
| download | drakx-8f5d72a12b4488f3007c73537d5212b6b67cadce.tar drakx-8f5d72a12b4488f3007c73537d5212b6b67cadce.tar.gz drakx-8f5d72a12b4488f3007c73537d5212b6b67cadce.tar.bz2 drakx-8f5d72a12b4488f3007c73537d5212b6b67cadce.tar.xz drakx-8f5d72a12b4488f3007c73537d5212b6b67cadce.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_any.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 17 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 6 |
4 files changed, 25 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 2ef837916..a43a33be2 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -754,6 +754,11 @@ sub kdeicons_postinstall($) { template2userfile($prefix, "$ENV{SHARE_PATH}/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace); symlink "hd_umount.xpm", "$prefix/usr/share/icons/hd_unmount.xpm"; symlink "hd_umount.xpm", "$prefix/usr/share/icons/large/hd_unmount.xpm"; + } elsif (m|^/dev/(\S+)\s+/mnt/([^\/]*)\s+vfat\s+|) { + my %toreplace = ( device => $1, id => $1, mntpoint => "/mnt/$2" ); + template2userfile($prefix, "$ENV{SHARE_PATH}/Dos_.kdelnk.in", "Desktop/$2.kdelnk", 1, %toreplace); + symlink "hd_umount.xpm", "$prefix/usr/share/icons/hd_unmount.xpm"; + symlink "hd_umount.xpm", "$prefix/usr/share/icons/large/hd_unmount.xpm"; } elsif (m|^/dev/(\S+)\s+(\S*)\s+vfat\s+|) { my %toreplace = ( device => $1, id => $1, mntpoint => $2 ); template2userfile($prefix, "$ENV{SHARE_PATH}/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index bf5e7d6f1..867135dfb 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -767,7 +767,7 @@ sub readBootloaderConfigBeforeInstall { $v = "/boot/$v" if $v !~ m|^/|; if (-e "$o->{prefix}$v") { my $e = lilo::get("/boot/$image", $o->{bootloader}) or next; - $e->{kernel} = $v; + $e->{kernel_or_dev} = $v; log::l("renaming /boot/$image entry by $v"); } } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 6e9afe25f..4c85007c1 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -524,7 +524,7 @@ sub load_thiskind($;&$) { my @devs = (@pcidevs, @pcmciadevs); - load("sd_mod") if $type eq 'scsi' && @devs; + load("sd_mod") if $type eq 'scsi' && @devs; my %devs; foreach (@devs) { my ($text, $mod) = @$_; @@ -593,3 +593,18 @@ sub load_ide { load_multi(qw(ide-probe ide-disk ide-cd)); } } + +sub load_usbscsi { #- TODO + require pci_probing::main; + eval { + if (my ($c) = grep { /usb-/ } map { $_->[1] } pci_probing::main::probe('')) { + load($c, "SERIAL_USB"); load("usb-storage"); + sleep(1); + if (!$@ && -e "/proc/scsi/usb/0") { + return 1; + } + unload("usb-storage"); + } + }; + 0; +} diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 9443329ae..09ccbc365 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -140,9 +140,9 @@ sub detect() { my ($r, $wacom) = mouseconfig(); return ($r, $wacom) if $r; require pci_probing::main; - if (my ($c) = grep { $_->[1] =~ /usb-/ } pci_probing::main::probe('')) { + if (my ($c) = grep { /usb-/ } map { $_->[1] } pci_probing::main::probe('')) { eval { - modules::load($c->[1], "SERIAL_USB"); + modules::load($c, "SERIAL_USB"); modules::load("usbmouse"); modules::load("mousedev"); }; @@ -155,7 +155,7 @@ sub detect() { } modules::unload("mousedev"); modules::unload("usbmouse"); - modules::unload($c->[1], 'remove_alias'); + modules::unload($c, 'remove_alias'); } #- defaults to generic ttyS0 |