diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-03-12 15:18:34 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-03-12 15:18:34 +0000 |
| commit | 18a5572ee8e3850f1d1f928d43d2e1799594dbd9 (patch) | |
| tree | a8d7ff802b09c27d3cf3d169167fb4371836cba9 /perl-install/modules.pm | |
| parent | ece757a4920eb93a5eef727f710094c65b767118 (diff) | |
| download | drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.gz drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.bz2 drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.xz drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.zip | |
fixed live update between GLIBC 2.1 and GLIBC 2.2. should work for other
combination but not tested. fixed locale usage and gtk environment
interaction (added LOCPATH, GCONV_PATH and GTK_EXE_PREFIX).
created LD_LOADER environment variable to keep track of right ELF loader
to be used for the GLIBC used by the live update. added internal PATH
to LD_LIBRARY_PATH as ELF loader only check this one and not PATH.
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index ac3eea669..ee0187d04 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -425,7 +425,8 @@ sub load { if ($::testing) { log::l("i try to install $name module (@options)"); } elsif ($::isStandalone || $::live) { - run_program::run("modprobe", $name, @options) or die "insmod'ing module $name failed"; + run_program::run(-x "/sbin/modprobe.static" ? "/sbin/modprobe.static" : "/sbin/modprobe", $name, @options) + or die "insmod'ing module $name failed"; } else { $conf{$name}{loaded} and return; @@ -450,7 +451,7 @@ sub load_multi { if ($::testing) { log::l("i would install modules @l"); } elsif ($::isStandalone || $::live) { - foreach (@l) { run_program::run("modprobe", $_) } + foreach (@l) { run_program::run(-x "/sbin/modprobe.static" ? "/sbin/modprobe.static" : "/sbin/modprobe", $_) } } else { load_raw(map { [ $_ ] } @l); } |