Changeset 5489931


Ignore:
Timestamp:
02/17/15 06:54:43 (3 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.1.2
Children:
9834186
Parents:
7d17f07
Message:

Fix a bug causing the FAT partition space to not be reserved from
advanced installations

Location:
src-qt5/pc-installgui
Files:
2 edited

Legend:

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

    r1e77bb0 r5489931  
    533533  force4K = zForce; 
    534534  forceBIOS=biosMode; 
     535 
     536  // Check if we are running in EFI mode 
     537  if ( forceBIOS == "efi" ) 
     538    efiMode=true; 
     539  else 
     540    efiMode=false; 
    535541 
    536542  // Save the new disk layout 
  • src-qt5/pc-installgui/wizardDisk.cpp

    r1e77bb0 r5489931  
    639639  disk.truncate(disk.indexOf(" -")); 
    640640 
    641   int safeBuf = 10; 
     641  int safeBuf = 15; 
    642642 
    643643  // If on EFI we subtract 100MiB to save for a FAT16/EFI partition 
    644   if ( efiMode ) 
    645     safeBuf = 110; 
     644  if ( radioUEFI->isChecked() ) 
     645    safeBuf = 115; 
    646646 
    647647  // Check the full disk 
     
    653653        sysDisks.at(i).at(2).toInt(&ok); 
    654654        if( ok ) 
    655           return sysDisks.at(i).at(2).toInt(&ok) - safeBuf; 
     655          return (sysDisks.at(i).at(2).toInt(&ok) - safeBuf); 
    656656        else 
    657657          return -1; 
     
    668668        sysDisks.at(i).at(3).toInt(&ok); 
    669669        if( ok ) 
    670           return sysDisks.at(i).at(3).toInt(&ok) - safeBuf; 
     670          return (sysDisks.at(i).at(3).toInt(&ok) - safeBuf); 
    671671        else 
    672672          return -1; 
Note: See TracChangeset for help on using the changeset viewer.