Subversion Repositories livecd

Rev

Rev 36 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36 Rev 43
Line 24... Line 24...
24 
                unionfs \
 24 
                unionfs \
25 
                squashfs"
 25 
                squashfs"
26 
 
 26 
 
27 
# RPMs that can break future Scientific Linux updates
 27 
# RPMs that can break future Scientific Linux updates
28 
# because there are not part of Scientific Linux
 28 
# because there are not part of Scientific Linux
29 
RPMS_TO_REMOVE_SL="kernel-module-ntfs"
 29 
RPMS_TO_REMOVE_SL="kernel-module-ntfs \
- 
 
 30 
                   nvidia.*psi"
30
31
31 
# RPMs that can break future PSI SL updates
 32 
# RPMs that can break future PSI SL updates
32 
# because there are not part of PSI Scientific Linux
 33 
# because there are not part of PSI Scientific Linux
33 
RPMS_TO_REMOVE_PSI=""
 34 
RPMS_TO_REMOVE_PSI=""
34
35
Line 629... Line 630...
629 
    done
 630 
    done
630 
    echo "done."; echo
 631 
    echo "done."; echo
631 
fi
 632 
fi
632 
 
 633 
 
633 
 
 634 
 
- 
 
 635 
### disable nvidia driver
- 
 
 636 
### -----------------------------------------------------------
- 
 
 637 
# not in case of a PSI installation
- 
 
 638 
if [ ! -e /etc/sysconfig/cfengine ]; then
- 
 
 639 
    if [ -e $new/etc/X11/xorg.conf.nv_SAVED ]; then
- 
 
 640 
        # copy back original xorg.conf
- 
 
 641 
	mv $new/etc/X11/xorg.conf.nv_SAVED $new/etc/X11/xorg.conf
- 
 
 642 
        # disable nvidia libs
- 
 
 643 
	LIB=lib
- 
 
 644 
	[ $( arch ) = "x86_64" ] && LIB=lib64
- 
 
 645 
	mv $new/usr/X11R6/$LIB/modules/extensions/xxx.libGLcore.a.saved_by_nvidia $new/usr/X11R6/$LIB/modules/extensions/libGLcore.a
- 
 
 646 
	mv $new/usr/X11R6/$LIB/modules/extensions/xxx.libglx.a.saved_by_nvidia $new/usr/X11R6/$LIB/modules/extensions/libglx.a
- 
 
 647 
	rm -f $new/usr/X11R6/$LIB/libGL.so*
- 
 
 648 
	rm -f $new/usr/$LIB/libGLcore.so
- 
 
 649 
    fi
- 
 
 650 
fi
- 
 
 651 
 
- 
 
 652 
 
634 
### umount $INSTALL_PART
 653 
### umount $INSTALL_PART
635 
### -----------------------------------------------------------
 654 
### -----------------------------------------------------------
636 
umount $NEW/dev
 655 
umount $NEW/dev
637 
umount $NEW/sys
 656 
umount $NEW/sys
638 
umount $NEW/proc
 657 
umount $NEW/proc