Subversion Repositories livecd

Rev

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

Rev 49 Rev 50
Line 472... Line 472...
472 
    echo "Create grub.conf ..."
 472 
    echo "Create grub.conf ..."
473 
 
 473 
 
474 
    TITLE="Linux"
 474 
    TITLE="Linux"
475 
    [ -e $NEW//etc/redhat-release ] && TITLE=$( cat $NEW/etc/redhat-release )
 475 
    [ -e $NEW//etc/redhat-release ] && TITLE=$( cat $NEW/etc/redhat-release )
476 
 
 476 
 
- 
 
 477 
    DEFAULT=0
- 
 
 478 
    # set default=1, if smp kernel is running
- 
 
 479 
    uname -r | grep -q smp
- 
 
 480 
    [ "$?" = "0" ] && DEFAULT=1
- 
 
 481 
 
477 
    cat > $NEW/boot/grub/grub.conf <<EOF
 482 
    cat > $NEW/boot/grub/grub.conf <<EOF
478 
# grub.conf generated by $SCRIPTNAME
 483 
# grub.conf generated by $SCRIPTNAME
479 
default=0
 484 
default=$DEFAULT
480 
timeout=5
 485 
timeout=5
481 
splashimage=$GRUB_ROOT_PART/boot/grub/splash.xpm.gz
 486 
splashimage=$GRUB_ROOT_PART/boot/grub/splash.xpm.gz
482 
#hiddenmenu
 487 
#hiddenmenu
483 
EOF
 488 
EOF
484 
 
 489 
 
Line 642... Line 647...
642 
### disable nvidia driver
647 
### disable nvidia driver
643 
### -----------------------------------------------------------
 648 
### -----------------------------------------------------------
644 
# not in case of a PSI installation
 649 
# not in case of a PSI installation
645 
if [ ! -e /etc/sysconfig/cfengine ]; then
 650 
if [ ! -e /etc/sysconfig/cfengine ]; then
646 
    if [ -e $NEW/etc/X11/xorg.conf.nv_SAVED ]; then
 651 
    if [ -e $NEW/etc/X11/xorg.conf.nv_SAVED ]; then
647 
        # copy back original xorg.conf
 652 
        # correct xorg.conf
- 
 
 653 
	sed -i "s/#nv_SAVED //" $NEW/etc/X11/xorg.conf
648 
	mv -f $NEW/etc/X11/xorg.conf.nv_SAVED $NEW/etc/X11/xorg.conf
 654 
	sed -i "/.*Driver.*nvidia.*/d" $NEW/etc/X11/xorg.conf
649 
        # disable nvidia libs
 655 
        # disable nvidia libs (if not yet done by rpm -e)
650 
	LIB=lib
 656 
	LIB=lib
651 
	[ $( arch ) = "x86_64" ] && LIB=lib64
 657 
	[ $( arch ) = "x86_64" ] && LIB=lib64
652 
	mv -f $NEW/usr/X11R6/$LIB/modules/extensions/xxx.libGLcore.a.saved_by_nvidia \
 658 
	mv -f $NEW/usr/X11R6/$LIB/modules/extensions/xxx.libGLcore.a.saved_by_nvidia \
653 
              $NEW/usr/X11R6/$LIB/modules/extensions/libGLcore.a 2>/dev/null
 659 
              $NEW/usr/X11R6/$LIB/modules/extensions/libGLcore.a 2>/dev/null
654 
	mv -f $NEW/usr/X11R6/$LIB/modules/extensions/xxx.libglx.a.saved_by_nvidia \
 660 
	mv -f $NEW/usr/X11R6/$LIB/modules/extensions/xxx.libglx.a.saved_by_nvidia \