Subversion Repositories livecd

Rev

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

Rev 46 Rev 47
Line 624... Line 624...
624 
    fi
 624 
    fi
625 
 
 625 
 
626 
    for rpm in $RPMSTOREMOVE; do
 626 
    for rpm in $RPMSTOREMOVE; do
627 
	rpms_remove=$( cat /tmp/rpmlist | grep "^$rpm" )
 627 
	rpms_remove=$( cat /tmp/rpmlist | grep "^$rpm" )
628 
	for rpm_remove in $rpms_remove; do
628 
	for rpm_remove in $rpms_remove; do
629 
	    chroot $NEW rpm -e --nodeps $rpm_remove 2>/dev/null
 629 
	    chroot $NEW rpm -e --nodeps $rpm_remove >/dev/null 2>&1
630 
	    [ "$?" = "0" ] && echo " removing $rpm_remove"
 630 
	    [ "$?" = "0" ] && echo " removing $rpm_remove"
631 
	done
 631 
	done
632 
    done
 632 
    done
633 
    echo "done."; echo
 633 
    echo "done."; echo
634 
fi
 634 
fi
Line 636... Line 636...
636 
 
 636 
 
637 
### disable nvidia driver
637 
### disable nvidia driver
638 
### -----------------------------------------------------------
 638 
### -----------------------------------------------------------
639 
# not in case of a PSI installation
 639 
# not in case of a PSI installation
640 
if [ ! -e /etc/sysconfig/cfengine ]; then
 640 
if [ ! -e /etc/sysconfig/cfengine ]; then
641 
    if [ -e $new/etc/X11/xorg.conf.nv_SAVED ]; then
 641 
    if [ -e $NEW/etc/X11/xorg.conf.nv_SAVED ]; then
642 
        # copy back original xorg.conf
 642 
        # copy back original xorg.conf
643 
	mv $new/etc/X11/xorg.conf.nv_SAVED $new/etc/X11/xorg.conf
 643 
	mv -f $NEW/etc/X11/xorg.conf.nv_SAVED $NEW/etc/X11/xorg.conf
644 
        # disable nvidia libs
 644 
        # disable nvidia libs
645 
	LIB=lib
 645 
	LIB=lib
646 
	[ $( arch ) = "x86_64" ] && LIB=lib64
 646 
	[ $( arch ) = "x86_64" ] && LIB=lib64
647 
	mv $new/usr/X11R6/$LIB/modules/extensions/xxx.libGLcore.a.saved_by_nvidia $new/usr/X11R6/$LIB/modules/extensions/libGLcore.a
 647 
	mv -f $NEW/usr/X11R6/$LIB/modules/extensions/xxx.libGLcore.a.saved_by_nvidia \
- 
 
 648 
              $NEW/usr/X11R6/$LIB/modules/extensions/libGLcore.a
648 
	mv $new/usr/X11R6/$LIB/modules/extensions/xxx.libglx.a.saved_by_nvidia $new/usr/X11R6/$LIB/modules/extensions/libglx.a
 649 
	mv -f $NEW/usr/X11R6/$LIB/modules/extensions/xxx.libglx.a.saved_by_nvidia \
- 
 
 650 
              $NEW/usr/X11R6/$LIB/modules/extensions/libglx.a
- 
 
 651 
	rm -f $NEW/usr/X11R6/$LIB/modules/extensions/libglx.so
649 
	rm -f $new/usr/X11R6/$LIB/libGL.so*
 652 
	rm -f $NEW/usr/X11R6/$LIB/libGL.so*
650 
	rm -f $new/usr/$LIB/libGLcore.so
 653 
	rm -f $NEW/usr/$LIB/libGLcore.so
651 
    fi
 654 
    fi
652 
fi
 655 
fi
653 
 
 656 
 
654 
 
 657 
 
655 
### umount $INSTALL_PART
 658 
### umount $INSTALL_PART