Ignore:
Timestamp:
10/23/13 09:16:41 (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:
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/installer.cpp

    r8d3682c r07eb74c  
    3535    nextButton->setText(tr("&Next")); 
    3636 
    37     // Init the MBR to yes 
    38     loadMBR = true; 
     37    // Init the boot-loader 
     38    bootLoader = QString("GRUB"); 
    3939    // Init the GPT to no 
    4040    loadGPT = false; 
     
    506506  if ( radioRestore->isChecked() ) 
    507507    wDisk->setRestoreMode(); 
    508   connect(wDisk, SIGNAL(saved(QList<QStringList>, bool, bool, QString, bool)), this, SLOT(slotSaveDiskChanges(QList<QStringList>, bool, bool, QString, bool))); 
     508  connect(wDisk, SIGNAL(saved(QList<QStringList>, QString, bool, QString, bool)), this, SLOT(slotSaveDiskChanges(QList<QStringList>, QString, bool, QString, bool))); 
    509509  wDisk->show(); 
    510510  wDisk->raise(); 
     
    537537} 
    538538 
    539 void Installer::slotSaveDiskChanges(QList<QStringList> newSysDisks, bool MBR, bool GPT, QString zName, bool zForce ) 
    540 { 
    541  
     539void Installer::slotSaveDiskChanges(QList<QStringList> newSysDisks, QString BL, bool GPT, QString zName, bool zForce ) 
     540{ 
     541 
     542  bootLoader=BL; 
    542543  zpoolName = zName;  
    543544  force4K = zForce; 
    544545 
    545546  // Save the new disk layout 
    546   loadMBR = MBR; 
    547547  loadGPT = GPT; 
    548548  sysFinalDiskLayout = newSysDisks; 
     
    10911091    tmpList << "partition=" + tmpSlice; 
    10921092 
    1093     // Are we loading a boot-loader? 
    1094     if ( loadMBR ) 
    1095       tmpList << "bootManager=GRUB"; 
    1096     else { 
    1097       // If the user declined the GRUB MBR, but we are still using a slice, install it to the slice 
    1098       // for chain-loading later 
    1099       if ( tmpSlice != "ALL" && ! loadGPT ) 
    1100         tmpList << "bootManager=GRUB-slice"; 
    1101       else 
    1102         tmpList << "bootManager=none"; 
    1103     } 
     1093    // Which boot-loader are we stamping? 
     1094    tmpList << "bootManager=" + bootLoader; 
    11041095 
    11051096    // Set the GPT/MBR options 
Note: See TracChangeset for help on using the changeset viewer.