diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-01-09 13:51:36 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-01-09 13:51:36 +0000 |
| commit | fa0d9cfcff26a0b7585efb51f963c8a649cfa932 (patch) | |
| tree | 10c15958e826076a482d9b3e858e83621ade6589 | |
| parent | 718ffae789e39217e199a5ca377ea4b76b0725ba (diff) | |
| download | drakx-fa0d9cfcff26a0b7585efb51f963c8a649cfa932.tar drakx-fa0d9cfcff26a0b7585efb51f963c8a649cfa932.tar.gz drakx-fa0d9cfcff26a0b7585efb51f963c8a649cfa932.tar.bz2 drakx-fa0d9cfcff26a0b7585efb51f963c8a649cfa932.tar.xz drakx-fa0d9cfcff26a0b7585efb51f963c8a649cfa932.zip | |
add update-ldetect-lst after install_addons.
| -rw-r--r-- | perl-install/detect_devices.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 975ccb8b1..ab87cadc3 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -420,12 +420,15 @@ EOF sub install_addons { my ($prefix) = @_; - if (-d $prefix) { + #- this test means install_addons can only be called after ldetect-lst has been installed. + if (-d "$prefix/usr/share/ldetect-lst") { + my $update = 0; foreach ([ 'pcitable.d', $pcitable_addons ], [ 'usbtable.d', $usbtable_addons ]) { my ($dir, $str) = @$_; - -d "$prefix/$dir" && $str =~ /^[^#]/m and - output "$prefix/$dir/95drakx.lst", $str; + -d "$prefix/usr/share/ldetect-lst/$dir" && $str =~ /^[^#]/m and $update = 1 and + output "$prefix/usr/share/ldetect-lst/$dir/95drakx.lst", $str; } + $update and run_program::rooted($prefix, "/usr/sbin/update-ldetect-lst"); } } |