Changes in / [607d79b:82ea8a6]


Ignore:
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-systemupdatertray/UpdaterTray.cpp

    r7cc177e r88de14c  
    338338 
    339339  //Check for installed system updates needing computer to restart to finish 
    340   bool needRestart = false; 
    341   if( QFile::exists("/usr/local/tmp/update-stagedir/doupdate.sh") ){ 
    342     needRestart = true; 
     340  if ( QFile::exists("/tmp/.fbsdup-reboot") ) { 
     341     programstatus = SYSTEM_RESTART_NEEDED; 
     342     contextMenuRefresh(); 
     343     displayTooltip(); 
     344     doingCheck=false; 
     345     return; 
    343346  } 
    344347 
     
    433436  ///////////////////////////////////////////// 
    434437 
    435   if ( needRestart ) { 
    436     programstatus = SYSTEM_RESTART_NEEDED; 
    437   } else if ( haveUp ) { 
     438  if ( haveUp ) { 
    438439    programstatus = SYSTEM_UPDATE_AVAIL; 
    439440  } else if ( haveNGUp ) { 
  • src-qt4/pc-updategui/mainWin.cpp

    rd47ba25 r88de14c  
    239239         if ( listUpdates.at(z).at(1) == "FBSDUPDATE" ) { 
    240240           uProc->start("freebsd-update", QStringList() << "install");  
     241           system("touch /tmp/.fbsdup-reboot"); 
    241242         } else { 
    242243           uProc->start("pc-updatemanager", QStringList() << "install" << tag );  
     
    357358  groupUpdates->setEnabled(false); 
    358359  listUpdates.clear(); 
     360 
     361  if ( QFile::exists("/tmp/.fbsdup-reboot") ) { 
     362     textLabel->setText(tr("Reboot required for update to finish!")); 
     363     return; 
     364  } 
     365 
    359366  textLabel->setText(tr("Checking for updates... Please Wait...")); 
    360367  slotReadUpdateData(); 
     
    544551  QString line, toPatchVer, tmp; 
    545552  QStringList up, listDesc, listPkgs; 
     553 
     554  if ( QFile::exists("/tmp/.fbsdup-reboot") ) { 
     555     qDebug() << "Skipping update check - Waiting for reboot"; 
     556     return; 
     557  } 
    546558 
    547559  if ( QFile::exists("/tmp/.fbsdup-lock") ) { 
  • src-sh/pc-updatemanager/pc-updatemanager

    rb246b06 r88de14c  
    452452  fi 
    453453 
     454  # Touch our marker that we will need to reboot before doing other updates 
     455  touch /tmp/.fbsdup-reboot 
     456 
    454457  # Now install freebsd-update files 
    455458  freebsd-update --non-interactive install 
Note: See TracChangeset for help on using the changeset viewer.