kolan
/
Snail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove all preloads. Debian Squeeze now works fine!

This commit is contained in:
Kolan Sh 2012-04-02 15:30:15 -04:00
parent 89c57c266d
commit 9ee2073972
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nvrun
View File

@ -16,8 +16,6 @@ FIFO_FILE=/tmp/.snail.fifo
if [ 0 -eq $? ]; then
echo "Running $@ on nVidia"
export LD_LIBRARY_PATH=/usr/lib/snail:/usr/lib/snail/lib
[ -f /usr/lib/snail/libGL.so ] && LD_PRELOAD=$LD_PRELOAD:/usr/lib/snail/libGL.so
[ -f /usr/lib/snail/libnvidia-tls.so ] && LD_PRELOAD=$LD_PRELOAD:/usr/lib/snail/libnvidia-tls.so
snail.vglrun -d :1 "$@"
echo "Application $@ was performed on nVidia"

44
sbin/snail.configure
View File

@ -132,8 +132,35 @@ case "$DISTRIB_ID" in
"debian")
grep '^acpi_call$' /etc/modules || echo acpi_call >> /etc/modules
case "$DISTRIB_RELEASE" in
"squeeze")
"6.0.4")
# nVidia driver installed from Debian repositories
if [ -f /usr/lib/nvidia/diversions/libGL.so.1 ]; then
ln -sf /usr/lib/xorg/modules/libfb.so /usr/lib/snail/libfb.so
ln -sf /usr/lib/xorg/modules/libwfb.so /usr/lib/snail/libwfb.so
ln -sf /usr/lib/xorg/modules/drivers/nvidia_drv.so /usr/lib/snail/nvidia_drv.so
# rm -f /usr/lib/xorg/modules/extensions/libglx.so
ln -sf /usr/lib/xorg/modules/extensions/libglx.so.[0-9][0-9]* /usr/lib/snail/libglx.so
ln -sf /usr/lib/libGL.so.[0-9][0-9]* /usr/lib/snail/libGL.so.1
# apt-get install --reinstall xserver-xorg-core
# rm -f /etc/alternatives/libGL.so.1
# ln -s /usr/lib/nvidia/diversions/libGL.so.1 /etc/alternatives
# nVidia driver was installed by NVIDIA-installer...run
else
ln -sf /usr/lib/xorg/modules/libfb.so /usr/lib/snail/libfb.so
ln -sf /usr/lib/xorg/modules/libwfb.so /usr/lib/snail/libwfb.so
ln -sf /usr/lib/xorg/modules/drivers/nvidia_drv.so /usr/lib/snail/nvidia_drv.so
ln -sf /usr/lib/xorg/modules/extensions/libglx.so.[0-9][0-9]* /usr/lib/snail/libglx.so
ln -sf /usr/lib/libGL.so.[0-9][0-9]* /usr/lib/snail/libGL.so.1
rm -f /usr/lib/libGL.so /usr/lib/libGL.so.1
mv -f /usr/lib/libGL.so.* /tmp
apt-get install --reinstall libgl1-mesa-glx
mv -f /tmp/libGL.so.* /usr/lib
fi
;;
"wheezy")
@ -144,20 +171,7 @@ case "$DISTRIB_ID" in
echo "No rules for Your distribution. Please make a bug report."
exit -1
;;
#rm -f /usr/lib64/xorg/modules/extensions/libglx.so
#ln -sf /usr/lib64/xorg/modules/extensions/libglx.so.* /usr/lib64/snail/modules/extensions/libglx.so
#apt-get install --reinstall xserver-xorg-core
#if [ -f /usr/lib64/nvidia/diversions/libGL.so.1 ]; then
# rm -f /etc/alternatives/libGL.so.1
# ln -s /usr/lib64/nvidia/diversions/libGL.so.1 /etc/alternatives
#else
# rm -f /usr/lib64/libGL.so /usr/lib64/libGL.so.1
# ln -sf libGL.so.1 /usr/lib64/snail/libGL.so
# ln -sf /usr/lib64/libGL.so.* /usr/lib64/snail/libGL.so.1
# mv -f /usr/lib64/libGL.so.* /tmp
# apt-get install --reinstall libgl1-mesa-glx
# mv -f /tmp/libGL.so.* /usr/lib64
#fi
esac
;;
"fedora")