Subversion Repositories livecd

Rev

Rev 50 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 50 Rev 51
Line 647... Line 647...
647 
### disable nvidia driver
647 
### disable nvidia driver
648 
### -----------------------------------------------------------
 648 
### -----------------------------------------------------------
649 
# not in case of a PSI installation
 649 
# not in case of a PSI installation
650 
if [ ! -e /etc/sysconfig/cfengine ]; then
 650 
if [ ! -e /etc/sysconfig/cfengine ]; then
651 
    if [ -e $NEW/etc/X11/xorg.conf.nv_SAVED ]; then
 651 
    if [ -e $NEW/etc/X11/xorg.conf.nv_SAVED ]; then
- 
 
 652 
	echo "Remove nvidia driver and correct xorg.conf ..."
652 
        # correct xorg.conf
 653 
        # correct xorg.conf
653 
	sed -i "s/#nv_SAVED //" $NEW/etc/X11/xorg.conf
 654 
	sed -i "s/#nv_SAVED //" $NEW/etc/X11/xorg.conf
654 
	sed -i "/.*Driver.*nvidia.*/d" $NEW/etc/X11/xorg.conf
 655 
	sed -i "/.*Driver.*nvidia.*/d" $NEW/etc/X11/xorg.conf
655 
        # disable nvidia libs (if not yet done by rpm -e)
 656 
        # disable nvidia libs (if not yet done by rpm -e)
656 
	LIB=lib
 657 
	LIB=lib
Line 660... Line 661...
660 
	mv -f $NEW/usr/X11R6/$LIB/modules/extensions/xxx.libglx.a.saved_by_nvidia \
 661 
	mv -f $NEW/usr/X11R6/$LIB/modules/extensions/xxx.libglx.a.saved_by_nvidia \
661 
              $NEW/usr/X11R6/$LIB/modules/extensions/libglx.a 2>/dev/null
 662 
              $NEW/usr/X11R6/$LIB/modules/extensions/libglx.a 2>/dev/null
662 
	rm -f $NEW/usr/X11R6/$LIB/modules/extensions/libglx.so
 663 
	rm -f $NEW/usr/X11R6/$LIB/modules/extensions/libglx.so
663 
	rm -f $NEW/usr/X11R6/$LIB/libGL.so*
 664 
	rm -f $NEW/usr/X11R6/$LIB/libGL.so*
664 
	rm -f $NEW/usr/$LIB/libGLcore.so
 665 
	rm -f $NEW/usr/$LIB/libGLcore.so
- 
 
 666 
	echo "done."; echo
665 
    fi
 667 
    fi
666 
fi
 668 
fi
667 
 
 669 
 
668 
 
 670 
 
669 
### umount $INSTALL_PART
 671 
### umount $INSTALL_PART