Ignore:
Timestamp:
10/23/13 09:16:41 (11 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:
9855292
Parents:
73ddd0ec
Message:

Update installer GUI to provide option to use old FreeBSD boot-loader
this will work for users who don't care about BE's or want to test
the FreeBSD loader when it begins to get these features.

Update pc-sysinstall backend to work with BSD/bsd GRUB/grub as the
bootManager= string

File:
1 edited

Legend:

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

    r4fb8829 r07eb74c  
    9898void wizardDisk::accept() 
    9999{ 
    100   bool useGRUB = true; 
     100  QString bootLoader; 
    101101  bool useGPT = false; 
    102102  bool force4K = false; 
     
    105105    useGPT = checkGPT->isChecked(); 
    106106 
    107   // Are we installing GRUB? 
    108   useGRUB = checkGRUB->isChecked(); 
    109  
    110   if ( comboPartition->currentIndex() != 0 && ! useGRUB  ) { 
     107  // Get the boot-loader 
     108  bootLoader = comboBootLoader->currentText(); 
     109  if ( radioBasic->isChecked() ) 
     110     bootLoader="GRUB"; 
     111 
     112  if ( comboPartition->currentIndex() != 0 && bootLoader == "NONE"  ) { 
    111113     QMessageBox::warning(this, tr("No boot-loader!"), 
    112      tr("You have chosen not to install GRUB on your MBR. You will need to manually setup your own MBR loader."), 
     114     tr("You have chosen not to install a boot-loader. You will need to manually setup your own loader."), 
    113115     QMessageBox::Ok, 
    114116     QMessageBox::Ok); 
     
    127129 
    128130  if ( radioExpert->isChecked() ) 
    129     emit saved(sysFinalDiskLayout, false, false, zpoolName, force4K); 
     131    emit saved(sysFinalDiskLayout, QString("NONE"), false, zpoolName, force4K); 
    130132  else 
    131     emit saved(sysFinalDiskLayout, useGRUB, useGPT, zpoolName, force4K); 
     133    emit saved(sysFinalDiskLayout, bootLoader, useGPT, zpoolName, force4K); 
    132134  close(); 
    133135} 
     
    141143       if (radioBasic->isChecked()) { 
    142144         checkGPT->setVisible(false); 
    143          checkGRUB->setVisible(false); 
     145         comboBootLoader->setVisible(false); 
     146         textBootLoader->setVisible(false); 
    144147         checkForce4K->setVisible(false); 
    145148         groupZFSPool->setVisible(false); 
     
    147150       if (radioAdvanced->isChecked()) { 
    148151         checkGPT->setVisible(true); 
    149          checkGRUB->setVisible(true); 
     152         comboBootLoader->setVisible(true); 
     153         textBootLoader->setVisible(true); 
    150154         checkForce4K->setVisible(true); 
    151155         groupZFSPool->setVisible(true); 
     
    238242           checkGPT->setVisible(true); 
    239243           checkForce4K->setVisible(true); 
    240            if ( comboPartition->currentIndex() == 0) 
    241              checkGRUB->setText(tr("Install GRUB (Required for Boot-Environment support)")); 
    242            else 
    243              checkGRUB->setText(tr("Stamp GRUB on MBR")); 
    244244         }  
    245245 
Note: See TracChangeset for help on using the changeset viewer.