Changeset 03d90a0


Ignore:
Timestamp:
04/16/14 12:58:17 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
ce5c3d7
Parents:
405554c0 (diff), 1e85620 (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-sh/lpreserver/backend/functions.sh

    ra3560cd r1e85620  
    7575 
    7676listZFSSnap() { 
    77   zfs list -t snapshot | grep -e "^${1}@" | awk '{print $1}' 
     77  zfs list -d 1 -t snapshot | grep -e "^${1}@" | awk '{print $1}' 
    7878} 
    7979 
    8080rmZFSSnap() { 
    81   `zfs list -t snapshot | grep -q "^$1@$2 "` || exit_err "No such snapshot!" 
     81  `zfs list -d 1 -t snapshot | grep -q "^$1@$2 "` || exit_err "No such snapshot!" 
    8282  if [ "$RECURMODE" = "ON" ] ; then 
    8383     flags="-r" 
     
    9191revertZFSSnap() { 
    9292  # Make sure this is a valid snapshot 
    93   `zfs list -t snapshot | grep -q "^$1@$2 "` || exit_err "No such snapshot!" 
     93  `zfs list -d 1 -t snapshot | grep -q "^$1@$2 "` || exit_err "No such snapshot!" 
    9494 
    9595  # Rollback the snapshot 
     
    134134 
    135135snaplist() { 
    136   zfs list -t snapshot | grep "^${1}@" | cut -d '@' -f 2 | awk '{print $1}' 
     136  zfs list -d 1 -t snapshot | grep "^${1}@" | cut -d '@' -f 2 | awk '{print $1}' 
    137137} 
    138138 
     
    300300 
    301301  # Check for the last snapshot marked as replicated already 
    302   lastSEND=`zfs get -r backup:lpreserver ${LDATA} | grep LATEST | awk '{$1=$1}1' OFS=" " | tail -1 | cut -d '@' -f 2 | cut -d ' ' -f 1` 
     302  lastSEND=`zfs get -d 1 backup:lpreserver ${LDATA} | grep LATEST | awk '{$1=$1}1' OFS=" " | tail -1 | cut -d '@' -f 2 | cut -d ' ' -f 1` 
    303303 
    304304  # Lets get the last snapshot for this dataset 
     
    390390    echo "------------------------------------------" 
    391391 
    392     lastSEND=`zfs get -r backup:lpreserver ${i} | grep LATEST | awk '{$1=$1}1' OFS=" " | tail -1 | cut -d '@' -f 2 | cut -d ' ' -f 1` 
     392    lastSEND=`zfs get -d 1 backup:lpreserver ${i} | grep LATEST | awk '{$1=$1}1' OFS=" " | tail -1 | cut -d '@' -f 2 | cut -d ' ' -f 1` 
    393393    lastSNAP=`zfs list -t snapshot -d 1 -H ${i} | tail -1 | awk '{$1=$1}1' OFS=" " | cut -d '@' -f 2 | cut -d ' ' -f 1` 
    394394 
     
    608608 
    609609  # Now lets mark none of our datasets as replicated 
    610   lastSEND=`zfs get -r backup:lpreserver ${LDATA} | grep LATEST | awk '{$1=$1}1' OFS=" " | tail -1 | cut -d '@' -f 2 | cut -d ' ' -f 1` 
     610  lastSEND=`zfs get -d 1 backup:lpreserver ${LDATA} | grep LATEST | awk '{$1=$1}1' OFS=" " | tail -1 | cut -d '@' -f 2 | cut -d ' ' -f 1` 
    611611  if [ -n "$lastSEND" ] ; then 
    612612     zfs set backup:lpreserver=' ' ${LDATA}@$lastSEND 
  • src-sh/lpreserver/backend/runsnap.sh

    rbf3df89 r1e85620  
    6565 
    6666  # Get the last replicated snapshot 
    67   lastSEND=`zfs get -r backup:lpreserver ${LDATA} | grep LATEST | awk '{$1=$1}1' OFS=" " | tail -1 | cut -d '@' -f 2 | cut -d ' ' -f 1` 
     67  lastSEND=`zfs get -d 1 backup:lpreserver ${LDATA} | grep LATEST | awk '{$1=$1}1' OFS=" " | tail -1 | cut -d '@' -f 2 | cut -d ' ' -f 1` 
    6868  if [ -n "$lastSEND" ] ; then 
    6969     sec="`echo $lastSEND | cut -d '-' -f 7`" 
  • lumina/lumina-desktop/LDesktop.cpp

    r9bc8c2a r405554c0  
    2626    bgtimer->setSingleShot(true); 
    2727  watcher = new QFileSystemWatcher(this); 
    28     connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(UpdateBackground()) ); 
     28    connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(SettingsChanged()) ); 
    2929    watcher->addPath(settings->fileName()); 
    3030  
     
    5353//     PRIVATE SLOTS  
    5454// ===================== 
     55void LDesktop::SettingsChanged(){ 
     56  QTimer::singleShot(1,this, SLOT(UpdateMenu()) ); 
     57  QTimer::singleShot(1,this, SLOT(UpdateBackground()) ); 
     58  QTimer::singleShot(1,this, SLOT(UpdateDesktop()) ); 
     59  QTimer::singleShot(1,this, SLOT(UpdatePanels()) ); 
     60  //Now send the signal on to all the panels as needed 
     61  for(int i=0; i<PANELS.length(); i++){ 
     62    QTimer::singleShot(1,PANELS[i], SLOT(UpdatePanel()) ); 
     63  } 
     64} 
     65 
    5566void LDesktop::UpdateMenu(){ 
    56   qDebug() << " - Update Menu"; 
     67  qDebug() << " - Update Menu:" << desktopnumber; 
    5768  deskMenu->clear(); 
    5869  //Add in the system applications menu 
     
    6778 
    6879void LDesktop::UpdateDesktop(){ 
    69   qDebug() << " - Update Desktop"; 
     80  qDebug() << " - Update Desktop:" << desktopnumber; 
    7081  QStringList plugins = settings->value(DPREFIX+"pluginlist", QStringList()).toStringList(); 
    7182  if(defaultdesktop && plugins.isEmpty()){ 
     
    107118 
    108119void LDesktop::UpdatePanels(){ 
    109   qDebug() << " - Update Panels"; 
     120  qDebug() << " - Update Panels:" << desktopnumber; 
    110121  int panels = settings->value(DPREFIX+"panels", 0).toInt(); 
    111122  //if(panels==0 && defaultdesktop){ panels=1; } //need at least 1 panel on the primary desktop 
     
    126137void LDesktop::UpdateBackground(){ 
    127138  //Get the current Background 
    128   qDebug() << " - Update Background for desktop:"<<desktopnumber; 
     139  qDebug() << " - Update Background:" << desktopnumber; 
    129140  //Get the list of background(s) to show 
    130141  settings->sync(); //make sure to catch external settings changes 
  • lumina/lumina-desktop/LDesktop.h

    r49640df r405554c0  
    5656         
    5757private slots: 
     58        void SettingsChanged(); 
    5859        void UpdateMenu(); 
    5960        void ShowMenu(){ 
Note: See TracChangeset for help on using the changeset viewer.