Broken nouveau KMS

[Christopher Thielen]

Hi fedora-users,

I think I broke my Fedora 20 Nouveau KMS when I tried out the nVidia driver.

My grub boot menu has three kernel entries and only the oldest of the 
three boots with the graphical loader and has X using the Nouveau 
driver. The two newer ones boot with the text-based progress bar and 
wind up with X loading the VESA driver.

I cannot figure out how to fix the newer kernel entries in grub to 
repair my Nouveau graphical boot.

Here's my /boot/grub2/grub.cfg, the entry "Fedora, with Linux 
3.12.8-300.fc20.x86_64" boots graphically while the two above it do not.

I very much appreciate any help in the matter!

#
# DO NOT EDIT THIS FILE
#
# It is automatically generated by grub2-mkconfig using templates
# from /etc/grub.d and settings from /etc/default/grub
#

### BEGIN /etc/grub.d/00_header ###
if [ -s $prefix/grubenv ]; then
   load_env
fi
if [ "${next_entry}" ] ; then
    set default="${next_entry}"
    set next_entry=
    save_env next_entry
    set boot_once=true
else
    set default="${saved_entry}"
fi

if [ x"${feature_menuentry_id}" = xy ]; then
   menuentry_id_option="--id"
else
   menuentry_id_option=""
fi

export menuentry_id_option

if [ "${prev_saved_entry}" ]; then
   set saved_entry="${prev_saved_entry}"
   save_env saved_entry
   set prev_saved_entry=
   save_env prev_saved_entry
   set boot_once=true
fi

function savedefault {
   if [ -z "${boot_once}" ]; then
     saved_entry="${chosen}"
     save_env saved_entry
   fi
}

function load_video {
   if [ x$feature_all_video_module = xy ]; then
     insmod all_video
   else
     insmod efi_gop
     insmod efi_uga
     insmod ieee1275_fb
     insmod vbe
     insmod vga
     insmod video_bochs
     insmod video_cirrus
   fi
}

terminal_output console
set timeout=5
### END /etc/grub.d/00_header ###

### BEGIN /etc/grub.d/10_linux ###
menuentry 'Fedora (3.12.10-300.fc20.x86_64) 20 (Heisenbug)' --class 
fedora --class gnu-linux --class gnu --class os $menuentry_id_option 
'gnulinux-3.12.8-300.fc20.x86_64-advanced-453822dd-727b-403e-95b1-5aa5f14c064c' 
{
	set gfxpayload=text
	insmod gzio
	insmod part_msdos
	insmod ext2
	set root='hd0,msdos1'
	if [ x$feature_platform_search_hint = xy ]; then
	  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 
--hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' 
  40405dbf-9856-4658-b8ae-8f517c2b7604
	else
	  search --no-floppy --fs-uuid --set=root 
40405dbf-9856-4658-b8ae-8f517c2b7604
	fi
	linux	/vmlinuz-3.12.10-300.fc20.x86_64 
root=/dev/mapper/fedora_mercury-root ro vconsole.font=latarcyrheb-sun16 
rd.lvm.lv=fedora_mercury/swap rd.lvm.lv=fedora_mercury/root  rhgb quiet 
LANG=en_US.UTF-8
	initrd /initramfs-3.12.10-300.fc20.x86_64.img
}
menuentry 'Fedora (3.12.9-301.fc20.x86_64) 20 (Heisenbug)' --class 
fedora --class gnu-linux --class gnu --class os $menuentry_id_option 
'gnulinux-3.12.8-300.fc20.x86_64-advanced-453822dd-727b-403e-95b1-5aa5f14c064c' 
{
	set gfxpayload=text
	insmod gzio
	insmod part_msdos
	insmod ext2
	set root='hd0,msdos1'
	if [ x$feature_platform_search_hint = xy ]; then
	  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 
--hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' 
  40405dbf-9856-4658-b8ae-8f517c2b7604
	else
	  search --no-floppy --fs-uuid --set=root 
40405dbf-9856-4658-b8ae-8f517c2b7604
	fi
	linux	/vmlinuz-3.12.9-301.fc20.x86_64 
root=/dev/mapper/fedora_mercury-root ro vconsole.font=latarcyrheb-sun16 
rd.lvm.lv=fedora_mercury/swap rd.lvm.lv=fedora_mercury/root  rhgb quiet 
LANG=en_US.UTF-8
	initrd /initramfs-3.12.9-301.fc20.x86_64.img
}
menuentry 'Fedora, with Linux 3.12.8-300.fc20.x86_64' --class fedora 
--class gnu-linux --class gnu --class os $menuentry_id_option 
'gnulinux-3.12.8-300.fc20.x86_64-advanced-453822dd-727b-403e-95b1-5aa5f14c064c' 
{
	set gfxpayload=text
	insmod gzio
	insmod part_msdos
	insmod ext2
	set root='hd0,msdos1'
	if [ x$feature_platform_search_hint = xy ]; then
	  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 
--hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' 
  40405dbf-9856-4658-b8ae-8f517c2b7604
	else
	  search --no-floppy --fs-uuid --set=root 
40405dbf-9856-4658-b8ae-8f517c2b7604
	fi
	linux	/vmlinuz-3.12.8-300.fc20.x86_64 
root=/dev/mapper/fedora_mercury-root ro vconsole.font=latarcyrheb-sun16 
rd.lvm.lv=fedora_mercury/swap rd.lvm.lv=fedora_mercury/root  rhgb quiet
	initrd	/initramfs-3.12.8-300.fc20.x86_64.img
}
menuentry 'Fedora, with Linux 0-rescue-aa0c7619c3ab4bf5b1db46dbf873e748' 
--class fedora --class gnu-linux --class gnu --class os 
$menuentry_id_option 
'gnulinux-0-rescue-aa0c7619c3ab4bf5b1db46dbf873e748-advanced-453822dd-727b-403e-95b1-5aa5f14c064c' 
{
	set gfxpayload=text
	insmod gzio
	insmod part_msdos
	insmod ext2
	set root='hd0,msdos1'
	if [ x$feature_platform_search_hint = xy ]; then
	  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 
--hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' 
  40405dbf-9856-4658-b8ae-8f517c2b7604
	else
	  search --no-floppy --fs-uuid --set=root 
40405dbf-9856-4658-b8ae-8f517c2b7604
	fi
	linux	/vmlinuz-0-rescue-aa0c7619c3ab4bf5b1db46dbf873e748 
root=/dev/mapper/fedora_mercury-root ro vconsole.font=latarcyrheb-sun16 
rd.lvm.lv=fedora_mercury/swap rd.lvm.lv=fedora_mercury/root  rhgb quiet
	initrd	/initramfs-0-rescue-aa0c7619c3ab4bf5b1db46dbf873e748.img
}

### END /etc/grub.d/10_linux ###

### BEGIN /etc/grub.d/20_linux_xen ###

### END /etc/grub.d/20_linux_xen ###

### BEGIN /etc/grub.d/20_ppc_terminfo ###
### END /etc/grub.d/20_ppc_terminfo ###

### BEGIN /etc/grub.d/30_os-prober ###
### END /etc/grub.d/30_os-prober ###

### BEGIN /etc/grub.d/40_custom ###
# This file provides an easy way to add custom menu entries.  Simply 
type the
# menu entries you want to add after this comment.  Be careful not to change
# the 'exec tail' line above.
### END /etc/grub.d/40_custom ###

### BEGIN /etc/grub.d/41_custom ###
if [ -f  ${config_directory}/custom.cfg ]; then
   source ${config_directory}/custom.cfg
elif [ -z "${config_directory}" -a -f  $prefix/custom.cfg ]; then
   source $prefix/custom.cfg;
fi
### END /etc/grub.d/41_custom ###