summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-04-19 14:44:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-04-19 14:44:48 +0000
commitcd21df05370c410a5558ad8ed4ae7e62c5c3e9e0 (patch)
treed74e8b9671f4afeeeca2fe2501bafd797c787724
parent3d00fc1e7e712c9b5b90a8cbf7c0742aec5e2608 (diff)
downloaddrakx-backup-do-not-use-cd21df05370c410a5558ad8ed4ae7e62c5c3e9e0.tar
drakx-backup-do-not-use-cd21df05370c410a5558ad8ed4ae7e62c5c3e9e0.tar.gz
drakx-backup-do-not-use-cd21df05370c410a5558ad8ed4ae7e62c5c3e9e0.tar.bz2
drakx-backup-do-not-use-cd21df05370c410a5558ad8ed4ae7e62c5c3e9e0.tar.xz
drakx-backup-do-not-use-cd21df05370c410a5558ad8ed4ae7e62c5c3e9e0.zip
- nvidia's libglx.so is hardwired to the tls version, change this
- if make_live is called more than once, part of removing the tls dirs can fail, but we may still want all of them to be removed
-rwxr-xr-xmove/make_live12
1 files changed, 5 insertions, 7 deletions
diff --git a/move/make_live b/move/make_live
index 49d99b24c..2685bdfd5 100755
--- a/move/make_live
+++ b/move/make_live
@@ -108,6 +108,10 @@ sub config_X_proprietary_drivers {
my ($full_name) = run_program::rooted_get_stdout($::prefix, 'rpm', '-ql', $_) =~ m!/usr/lib/(\Q$lib\E\..*)! or die '';
symlinkf($full_name, "$::prefix/usr/lib/$lib.$name_to_Driver{$_}");
}
+
+ #- nvidia's libglx.so is hardwired to the tls version, change this
+ system("cd $::prefix/usr/X11R6/lib/modules/extensions ; ln -sf libglx.so.* libglx.so");
+
#- remove the dirty hack done by NVIDIA_kernel-xxx proprietary package
#- we do it by hand when needed
substInFile { $_ = '' if /^nvidia$/ } "$::prefix/etc/modules";
@@ -130,13 +134,7 @@ run_program::rooted($::prefix, 'fc-cache'); #- generate cache in all directorie
#- system
# de-complexify, use the default on any arch
-eval {
- rm_rf("$::prefix/lib/i686");
- rm_rf("$::prefix/lib/tls");
- rm_rf("$::prefix/usr/lib/tls");
- rm_rf("$::prefix/usr/X11R6/lib/tls");
- rm_rf("$::prefix/usr/X11R6/lib/modules/extensions/tls");
-};
+eval { rm_rf("$::prefix$_") } foreach '/lib/i686', '/lib/tls', '/usr/lib/tls', '/usr/X11R6/lib/tls', '/usr/X11R6/lib/modules/extensions/tls';
eval { config_X_proprietary_drivers() };