[CentOS] HP Envy EFI problem after BIOS update

I have managed to boot into the installed Centos system, without using the KDE 
live CD.

By pressing F9 when turning on the laptop, I got the choose boot menu.  When 
the menu appeared, it had the old Fedora install, the current Centos install 
as well as the Windows install.

When I chose the Centos install it showed the GRUB menu and booted into Centos 
without error. This confirms that the Centos entry in the EFI data is still 
valid.

Once booted I then tried going through the process of running efibootmgr 
again. Once again, it looked to work perfectly, but for some reason the 
changes are not permenant, and if left alone, the laptop boots into Win8.

I'm out of ideas now.

Gary

[root at gary ~]# efibootmgr -v
BootCurrent: 0003
Timeout: 0 seconds
BootOrder: 0002,3002,0000,0003,2001,2002,2003
Boot0000* Fedora        
HD(2,145800,64000,14c4ac1d-abd8-4121-84ee-c05a825920de)File(\EFI\fedora\shim.efi)RC
Boot0002* Windows Boot Manager  
HD(2,145800,64000,14c4ac1d-abd8-4121-84ee-c05a825920de)File(\EFI\Microsoft\Boot\bootmgfw.efi)WINDOWS.........x...B.C.D.O.B.J.E.C.T.=.
{.9.d.e.a.8.6.2.c.-.5.c.d.d.-.4.e.7.0.-.a.c.c.1.-.f.3.2.b.3.4.4.d.4.7.9.5.}....................
Boot0003* CentOS Linux  
HD(2,145800,64000,14c4ac1d-abd8-4121-84ee-c05a825920de)File(\EFI\centos\shim.efi)
Boot2001* USB Drive (UEFI)      RC
Boot2002* Internal CD/DVD ROM Drive (UEFI)      RC
Boot3000* Internal Hard Disk or Solid State Disk        RC
Boot3002* Internal Hard Disk or Solid State Disk        RC
[root at gary ~]# efibootmgr -b 0000 -B
BootCurrent: 0003
Timeout: 0 seconds
BootOrder: 0002,3002,0003,2001,2002,2003
Boot0002* Windows Boot Manager
Boot0003* CentOS Linux
Boot2001* USB Drive (UEFI)
Boot2002* Internal CD/DVD ROM Drive (UEFI)
Boot3000* Internal Hard Disk or Solid State Disk
Boot3002* Internal Hard Disk or Solid State Disk
[root at gary ~]# echo $?
0
[root at gary ~]# efibootmgr -o 2002,2001,0003,0002
BootCurrent: 0003
Timeout: 0 seconds
BootOrder: 2002,2001,0003,0002
Boot0002* Windows Boot Manager
Boot0003* CentOS Linux
Boot2001* USB Drive (UEFI)
Boot2002* Internal CD/DVD ROM Drive (UEFI)
Boot3000* Internal Hard Disk or Solid State Disk
Boot3002* Internal Hard Disk or Solid State Disk
[root at gary ~]#[root at gary ~]# efibootmgr -v
BootCurrent: 0003
Timeout: 0 seconds
BootOrder: 0002,3002,0000,0003,2001,2002,2003
Boot0000* Fedora        
HD(2,145800,64000,14c4ac1d-abd8-4121-84ee-c05a825920de)File(\EFI\fedora\shim.efi)RC
Boot0002* Windows Boot Manager  
HD(2,145800,64000,14c4ac1d-abd8-4121-84ee-c05a825920de)File(\EFI\Microsoft\Boot\bootmgfw.efi)WINDOWS.........x...B.C.D.O.B.J.E.C.T.=.
{.9.d.e.a.8.6.2.c.-.5.c.d.d.-.4.e.7.0.-.a.c.c.1.-.f.3.2.b.3.4.4.d.4.7.9.5.}....................
Boot0003* CentOS Linux  
HD(2,145800,64000,14c4ac1d-abd8-4121-84ee-c05a825920de)File(\EFI\centos\shim.efi)
Boot2001* USB Drive (UEFI)      RC
Boot2002* Internal CD/DVD ROM Drive (UEFI)      RC
Boot3000* Internal Hard Disk or Solid State Disk        RC
Boot3002* Internal Hard Disk or Solid State Disk        RC
[root at gary ~]# efibootmgr -b 0000 -B
BootCurrent: 0003
Timeout: 0 seconds
BootOrder: 0002,3002,0003,2001,2002,2003
Boot0002* Windows Boot Manager
Boot0003* CentOS Linux
Boot2001* USB Drive (UEFI)
Boot2002* Internal CD/DVD ROM Drive (UEFI)
Boot3000* Internal Hard Disk or Solid State Disk
Boot3002* Internal Hard Disk or Solid State Disk
[root at gary ~]# echo $?
0
[root at gary ~]# efibootmgr -o 2002,2001,0003,0002
BootCurrent: 0003
Timeout: 0 seconds
BootOrder: 2002,2001,0003,0002
Boot0002* Windows Boot Manager
Boot0003* CentOS Linux
Boot2001* USB Drive (UEFI)
Boot2002* Internal CD/DVD ROM Drive (UEFI)
Boot3000* Internal Hard Disk or Solid State Disk
Boot3002* Internal Hard Disk or Solid State Disk
[root at gary ~]#