summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-09 15:35:12 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-09 15:35:12 +0000
commit788f568db7d4133fc0d744b4f007bb5674b02e47 (patch)
treee12f8894a0df9b63674531807ee5b6218f27399e /lib/Xconfig
parent546cfd5975bc1ecf7a6991e7a05d2e3359e00d48 (diff)
downloaddrakx-kbd-mouse-x11-788f568db7d4133fc0d744b4f007bb5674b02e47.tar
drakx-kbd-mouse-x11-788f568db7d4133fc0d744b4f007bb5674b02e47.tar.gz
drakx-kbd-mouse-x11-788f568db7d4133fc0d744b4f007bb5674b02e47.tar.bz2
drakx-kbd-mouse-x11-788f568db7d4133fc0d744b4f007bb5674b02e47.tar.xz
drakx-kbd-mouse-x11-788f568db7d4133fc0d744b4f007bb5674b02e47.zip
- run ldconfig after update-alternatives during installer too
(psb alternative does not have a higher priority than standard alternative, and ldconfig was run by the installer only before manually setting the alternative, which was not enough)
Diffstat (limited to 'lib/Xconfig')
-rw-r--r--lib/Xconfig/card.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 924110f..2fe2397 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -10,6 +10,7 @@ use modules;
use common;
use interactive;
use log;
+use run_program;
my $lib = arch() =~ /x86_64/ ? "lib64" : "lib";
@@ -373,9 +374,9 @@ sub libgl_config_and_more {
my $need_run_ldconfig = readlink($link) ne $wanted;
-e "$::prefix$wanted" or log::l("ERROR: $wanted does not exist, linking $link to it anyway");
common::symlinkf_update_alternatives('gl_conf', $wanted);
- if ($need_run_ldconfig && $::isStandalone) {
+ if ($need_run_ldconfig) {
log::explanations("ldconfig will be run because the GL library was $wanted");
- system("/sbin/ldconfig");
+ run_program::rooted($::prefix, 'ldconfig');
}
if (member($card->{Driver}, 'fglrx', 'nvidia')) {