Changeset 0130b27


Ignore:
Timestamp:
02/28/14 11:30:51 (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
c2b5aad, 194a5d3
Parents:
1f1481c9 (diff), a9fff64 (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:
5 edited

Legend:

Unmodified
Added
Removed
  • src-sh/lpreserver/backend/functions.sh

    r042dc70 ra3560cd  
    172172 
    173173  case $TIME in 
    174      [0-9][0-9]|sync) ;; 
     174     [0-9][0-9]|sync|hour|30min|10min) ;; 
    175175     *) exit_err "Invalid time: $TIME" 
    176176  esac 
     
    191191 
    192192  if [ "$TIME" != "sync" ] ; then 
     193    case $TIME in 
     194        hour) cTime="0     *" ;; 
     195       30min) cTime="*/30     *" ;; 
     196       10min) cTime="*/10     *" ;; 
     197           *) cTime="0     *" ;; 
     198    esac 
    193199    cronscript="${PROGDIR}/backend/runrep.sh" 
    194     cLine="0    $TIME       *       *       *" 
     200    cLine="$cTime       *       *       *" 
    195201    echo -e "$cLine\troot    ${cronscript} ${LDATA}" >> /etc/crontab 
    196202  fi 
  • src-sh/lpreserver/lpreserver

    r9cd0fa0 ra3560cd  
    155155 
    156156        add <remotehost> <user> <port> <hostdataset> <remotedataset> <time> 
     157 
     158        <time> = XX/sync/hour/30min/10min 
    157159 
    158160        Example 1:  
  • src-sh/pc-updatemanager/etcmerge

    rb95e8a8 ra9fff64  
    120120        fi 
    121121        for i in $(cat *.conflicts 2> /dev/null); do 
     122            if [ ! -e "etc-merged/$i" ] ; then continue ; fi 
    122123            if egrep -q '^(<<<<<<< |=======$|>>>>>>> )' etc-merged/$i; then 
    123124                echo "Unresolved conflicts in ${i}" 1>&2 
  • src-qt4/life-preserver/lp-tray/LPTray.cpp

    rcbe0295 r1f1481c9  
    184184    if(info.isEmpty()){continue;} 
    185185    //Take into account multiple devices/messages per type 
    186     QStringList devs=info[2].split(":::"); QStringList msgs=info[3].split(":::"); 
     186    QStringList devs=info[2].split(":::"); QStringList msg=info[3].split(":::"); 
    187187    for(int j=0; j<devs.length(); j++){ 
    188188      if(info[0] == "ERROR"){ 
    189         errs << info[1] + " (" + devs[j] + "): " + msgs[j]; 
     189        errs << info[1] + " (" + devs[j] + "): " + msg[j]; 
    190190      }else if(!info[0].isEmpty()){ 
    191         msgs << info[1] + " (" + devs[j] + "): " + msgs[j]; 
     191        msgs << info[1] + " (" + devs[j] + "): " + msg[j]; 
    192192      } 
    193193    } 
  • src-qt4/life-preserver/lp-tray/LPWatcher.cpp

    r9537cb2 r1f1481c9  
    8282  QStringList output; 
    8383  type = type.toLower(); 
    84   //Valid types - "critical"/"running"/"message" 
     84  //Valid types - "critical"/"running"/"message"/"replication"/"mirror"/"resilver"/"scrub" 
    8585  //Valid messages - "dataset","message","summary","id", "timestamp", "time" 
    8686  unsigned int base; 
Note: See TracChangeset for help on using the changeset viewer.