Ignore:
Timestamp:
09/02/13 06:46:24 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
7d94108a
Parents:
dfee0c1
Message:

When user is installing to a MBR slice, and declines to install GRUB on MBR, we
will instead stamp it on the particular slice being used. Then the user
can manage their own MBR boot-loader to chain-load GRUB from the slice

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/wizardDisk.cpp

    r93572be r1bfa1e0  
    106106  // Are we installing GRUB? 
    107107  useGRUB = checkGRUB->isChecked(); 
     108 
     109  if ( comboPartition->currentIndex() != 0 && ! useGRUB  ) { 
     110     QMessageBox::warning(this, tr("No boot-loader!"), 
     111     tr("You have chosen not to install GRUB on your MBR. You will need to manually setup your own MBR loader."), 
     112     QMessageBox::Ok, 
     113     QMessageBox::Ok); 
     114  } 
    108115      
    109116  // When doing advanced ZFS setups, make sure to use GPT 
     
    173180bool wizardDisk::validatePage() 
    174181{ 
     182 
    175183  // Generate suggested disk layout and show disk tree 
    176184  if ( prevID == Page_BasicDisk && currentId() == Page_Mounts) { 
     
    215223         return true; 
    216224     case Page_BasicDisk: 
    217          if ( comboPartition->currentIndex() == 0  && radioAdvanced->isChecked()) { 
    218            checkGPT->setVisible(true); 
    219            checkForce4K->setVisible(true); 
    220          } else { 
     225         
     226         if ( ! radioAdvanced->isChecked() ) { 
    221227           checkGPT->setChecked(false); 
    222228           checkGPT->setVisible(false); 
    223229           checkForce4K->setVisible(false); 
    224230           checkForce4K->setChecked(false); 
    225          } 
     231         } else { 
     232           checkGPT->setVisible(true); 
     233           checkForce4K->setVisible(true); 
     234           if ( comboPartition->currentIndex() == 0) 
     235             checkGRUB->setText(tr("Install GRUB (Required for Boot-Environment support)")); 
     236           else 
     237             checkGRUB->setText(tr("Stamp GRUB on MBR")); 
     238         }  
    226239 
    227240         // Doing a Advanced install 
Note: See TracChangeset for help on using the changeset viewer.