Changeset 0dd24a8


Ignore:
Timestamp:
Oct 9, 2013 8:04:50 AM (6 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
4069c7b
Parents:
f54df3c (diff), 82ea8a6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
4 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 
  • src-sh/pbi-manager10/pbi-manager

    r607d79b rf54df3c  
    11#!/bin/sh 
    22# 
    3 # Copyright 2011 iXsystems (Kris Moore) 
     3# Copyright 2013 iXsystems (Kris Moore) 
    44# All rights reserved 
    55# 
     
    70807080        cp ${PBI_WRAPPERFILE} ${PBI_CHROOTDIR}/.pbiwrapper-$ARCH 
    70817081 
     7082        # If we are doing a PKGNG build, lets set it up 
    70827083        if [ "$PBI_PKGNGBUILD" = "YES" ] ; then 
    70837084                mkdir -p ${PBI_CHROOTDIR}/usr/local/etc 2>/dev/null 
    70847085                cp /usr/local/etc/pkg.conf ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf 
     7086                # Make sure we change pkgng ARCH to what we are building 
     7087                sed -i '' "s|amd64|$ARCH|g" ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf      
     7088                sed -i '' "s|i386|$ARCH|g" ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf       
     7089                # Now make sure to copy over the pubkey 
    70857090                local pubKey=`cat /usr/local/etc/pkg.conf | grep "^PUBKEY:" | awk '{print $2}'` 
    70867091                if [ -n "$pubKey" ] ; then 
     
    70907095                        cp $pubKey ${PBI_CHROOTDIR}/$pubKey 
    70917096                fi 
     7097 
    70927098        fi 
    70937099 
Note: See TracChangeset for help on using the changeset viewer.