Changeset 7fb86bb


Ignore:
Timestamp:
09/03/14 09:48:09 (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
releng/10.0.3
Children:
19bab26
Parents:
3cf3701
git-author:
Ken Moore <ken@…> (09/03/14 09:42:47)
git-committer:
Ken Moore <ken@…> (09/03/14 09:48:09)
Message:

Fix the display of which BE is set as the default.
Use the current beadm setting instead of the current GRUB setting, since the GRUB file is itself a part of the BE and might be different from the globally set beadm value: so align the internal GRUB default with the beadm default in case the GRUB menu needs to get rebuilt.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-bootconfig/mainUI.cpp

    reb30981 r7fb86bb  
    289289      cols << blist[i].section("::",0,0); // [0] name 
    290290      cols << blist[i].section("::",1,1); // [1] is running 
    291       // [2] is default for next boot 
    292       if(G_defaultBE == i){ cols << "Yes"; } 
    293       else{ cols << "No"; } 
     291      cols << blist[i].section("::",2,2); // [2] is default for next boot 
     292      //Don't use GRUB default BE setting - this is itself part of a boot environment and might not be globally correct 
     293      if(G_defaultBE != i){ G_defaultBE = i; } 
    294294      cols << blist[i].section("::",5,6); // [3] date 
    295295      cols << blist[i].section("::",3,3); // [4] mountpoints 
Note: See TracChangeset for help on using the changeset viewer.