Changeset 1bfa1e0


Ignore:
Timestamp:
09/02/13 06:46:24 (14 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, releng/10.1
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

Location:
src-qt4/pc-installgui
Files:
3 edited

Legend:

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

    r8ac9a7f r1bfa1e0  
    10821082    if ( loadMBR ) 
    10831083      tmpList << "bootManager=GRUB"; 
    1084     else 
    1085       tmpList << "bootManager=none"; 
     1084    else { 
     1085      // If the user declined the GRUB MBR, but we are still using a slice, install it to the slice 
     1086      // for chain-loading later 
     1087      if ( tmpSlice != "ALL" && ! loadGPT ) 
     1088        tmpList << "bootManager=GRUB-slice"; 
     1089      else 
     1090        tmpList << "bootManager=none"; 
     1091    } 
    10861092 
    10871093    // Set the GPT/MBR options 
  • 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 
  • src-qt4/pc-installgui/wizardDisk.ui

    r93572be r1bfa1e0  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>628</width> 
    10     <height>385</height> 
     9    <width>641</width> 
     10    <height>386</height> 
    1111   </rect> 
    1212  </property> 
     
    427427     <widget class="QCheckBox" name="checkGRUB"> 
    428428      <property name="text"> 
    429        <string>Install GRUB boot-loader (Required for Boot-Environment support)</string> 
     429       <string>Install GRUB (Required for Boot-Environment support)</string> 
    430430      </property> 
    431431      <property name="checked"> 
Note: See TracChangeset for help on using the changeset viewer.