Changeset 30a0688


Ignore:
Timestamp:
07/31/13 09:52:36 (16 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
4f9718b, 242767e
Parents:
6b3b3fb (diff), 0fe982e (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

    r7814c14 r0fe982e  
    1313DBDIR="/var/db/lpreserver" 
    1414if [ ! -d "$DBDIR" ] ; then mkdir -p ${DBDIR} ; fi 
     15CMDLOG="${DBDIR}/lp-lastcmdout" 
     16LOGDIR="/var/log" 
     17export DBDIR LOGDIR PROGDIR CMDLOG 
    1518 
    16 LOGDIR="/var/log" 
    17 export DBDIR LOGDIR PROGDIR 
     19MSGQUEUE="" 
     20export MSGQUEUE 
    1821 
    1922#Set our Options 
     
    5558  fi 
    5659  zdate=`date +%Y-%m-%d-%H-%M-%S` 
    57   zfs snapshot $flags ${1}@$2${zdate} 
     60  zfs snapshot $flags ${1}@$2${zdate} >${CMDLOG} 2>${CMDLOG} 
    5861  return $? 
    5962} 
     
    7073     flags="-r" 
    7174  fi 
    72   zfs destroy -r ${1}@${2} 
     75  zfs destroy -r ${1}@${2} >${CMDLOG} 2>${CMDLOG} 
    7376  return $? 
    7477} 
     
    125128   echo "`date`: $@" >> ${LOGDIR}/lpreserver.log  
    126129} 
     130 
     131# E-Mail a message to the set addresses 
     132# 1 = subject tag 
     133# 2 = Message 
     134email_msg() { 
     135   if [ -z "$EMAILADDY" ] ; then return ; fi 
     136   echo -e "$2"  | mail -s "Life-Preserver `hostname`: $1" $EMAILADDY 
     137} 
     138 
     139queue_msg() { 
     140  MSGQUEUE="$MSGQUEUE $@"  
     141} 
     142 
     143echo_queue_msg() { 
     144  echo -e "$MSGQUEUE" 
     145} 
  • src-sh/lpreserver/backend/runsnap.sh

    rca25b67 r0fe982e  
    2222if [ $? -ne 0 ] ; then 
    2323  echo_log "ERROR: Failed creating snapshot on ${DATASET}" 
     24  email_msg "Snapshot ERROR" "ERROR: Failed creating snapshot on ${DATASET} @ `date`\n\r`cat $CMDLOG`" 
     25else 
     26  queue_msg "Success creating snapshot on ${DATASET} @ `date`\n\r`cat $CMDLOG`" 
    2427fi 
    2528 
     
    5053      if [ $? -ne 0 ] ; then 
    5154        echo_log "ERROR: Failed pruning snapshot $snap on ${DATASET}" 
     55        email_msg "Snapshot ERROR" "ERROR: Failed pruning snapshot $snap on ${DATASET} @ `date`\n\r`cat $CMDLOG`" 
     56      else 
     57        queue_msg "Success pruning snapshot $snap on ${DATASET} @ `date`\n\r`cat $CMDLOG`" 
    5258      fi 
    53    fi 
     59    fi 
    5460done 
     61 
     62if [ "$EMAILMODE" = "ALL" ] ; then 
     63   email_msg "Automated Snapshot" "`echo_queue_msg`" 
     64fi 
  • src-qt4/port-files/pkg-plist

    re49ab68 r6b3b3fb  
    66bin/pc-bluetoothmanager 
    77bin/pc-bluetoothtray 
     8bin/pc-bootconfig 
    89bin/pc-bugreport 
    910bin/pc-controlpanel 
     
    863864share/pcbsd/i18n/pc-bluetoothtray_ar.qm 
    864865share/pcbsd/i18n/pc-bluetoothtray_zu.qm 
     866share/pcbsd/share/pcbsd/i18n/pc-bootconfig_af.qm 
     867share/pcbsd/share/pcbsd/i18n/pc-bootconfig_ar.qm 
     868share/pcbsd/share/pcbsd/i18n/pc-bootconfig_az.qm 
     869share/pcbsd/share/pcbsd/i18n/pc-bootconfig_bg.qm 
     870share/pcbsd/share/pcbsd/i18n/pc-bootconfig_bn.qm 
     871share/pcbsd/i18n/pc-bootconfig_bs.qm 
     872share/pcbsd/i18n/pc-bootconfig_ca.qm 
     873share/pcbsd/i18n/pc-bootconfig_cs.qm 
     874share/pcbsd/i18n/pc-bootconfig_cy.qm 
     875share/pcbsd/i18n/pc-bootconfig_da.qm 
     876share/pcbsd/i18n/pc-bootconfig_de.qm 
     877share/pcbsd/i18n/pc-bootconfig_el.qm 
     878share/pcbsd/i18n/pc-bootconfig_en_GB.qm 
     879share/pcbsd/i18n/pc-bootconfig_en_ZA.qm 
     880share/pcbsd/i18n/pc-bootconfig_es.qm 
     881share/pcbsd/i18n/pc-bootconfig_et.qm 
     882share/pcbsd/i18n/pc-bootconfig_eu.qm 
     883share/pcbsd/i18n/pc-bootconfig_fa.qm 
     884share/pcbsd/i18n/pc-bootconfig_fi.qm 
     885share/pcbsd/i18n/pc-bootconfig_fr.qm 
     886share/pcbsd/i18n/pc-bootconfig_fr_CA.qm 
     887share/pcbsd/i18n/pc-bootconfig_gl.qm 
     888share/pcbsd/i18n/pc-bootconfig_he.qm 
     889share/pcbsd/i18n/pc-bootconfig_hi.qm 
     890share/pcbsd/i18n/pc-bootconfig_hr.qm 
     891share/pcbsd/i18n/pc-bootconfig_hu.qm 
     892share/pcbsd/i18n/pc-bootconfig_id.qm 
     893share/pcbsd/i18n/pc-bootconfig_is.qm 
     894share/pcbsd/i18n/pc-bootconfig_it.qm 
     895share/pcbsd/i18n/pc-bootconfig_ja.qm 
     896share/pcbsd/i18n/pc-bootconfig_ka.qm 
     897share/pcbsd/i18n/pc-bootconfig_ko.qm 
     898share/pcbsd/i18n/pc-bootconfig_lt.qm 
     899share/pcbsd/i18n/pc-bootconfig_lv.qm 
     900share/pcbsd/i18n/pc-bootconfig_mk.qm 
     901share/pcbsd/i18n/pc-bootconfig_mn.qm 
     902share/pcbsd/i18n/pc-bootconfig_ms.qm 
     903share/pcbsd/i18n/pc-bootconfig_mt.qm 
     904share/pcbsd/i18n/pc-bootconfig_nb.qm 
     905share/pcbsd/i18n/pc-bootconfig_nl.qm 
     906share/pcbsd/i18n/pc-bootconfig_pa.qm 
     907share/pcbsd/i18n/pc-bootconfig_pl.qm 
     908share/pcbsd/i18n/pc-bootconfig_pt.qm 
     909share/pcbsd/i18n/pc-bootconfig_pt_BR.qm 
     910share/pcbsd/i18n/pc-bootconfig_ro.qm 
     911share/pcbsd/i18n/pc-bootconfig_ru.qm 
     912share/pcbsd/i18n/pc-bootconfig_sa.qm 
     913share/pcbsd/i18n/pc-bootconfig_sk.qm 
     914share/pcbsd/i18n/pc-bootconfig_sl.qm 
     915share/pcbsd/i18n/pc-bootconfig_sr.qm 
     916share/pcbsd/i18n/pc-bootconfig_sv.qm 
     917share/pcbsd/i18n/pc-bootconfig_sw.qm 
     918share/pcbsd/i18n/pc-bootconfig_ta.qm 
     919share/pcbsd/i18n/pc-bootconfig_tg.qm 
     920share/pcbsd/i18n/pc-bootconfig_th.qm 
     921share/pcbsd/i18n/pc-bootconfig_tr.qm 
     922share/pcbsd/i18n/pc-bootconfig_uk.qm 
     923share/pcbsd/i18n/pc-bootconfig_uz.qm 
     924share/pcbsd/i18n/pc-bootconfig_vi.qm 
     925share/pcbsd/i18n/pc-bootconfig_zh_CN.qm 
     926share/pcbsd/i18n/pc-bootconfig_zh_HK.qm 
     927share/pcbsd/i18n/pc-bootconfig_zh_TW.qm 
     928share/pcbsd/i18n/pc-bootconfig_zu.qm 
    865929share/pcbsd/i18n/pc-controlpanel_af.qm 
    866930share/pcbsd/i18n/pc-controlpanel_zh_TW.qm 
  • src-qt4/src-qt4.pro

    re49ab68 r6b3b3fb  
    77         pc-bluetoothmanager \ 
    88         pc-bluetoothtray \ 
     9         pc-bootconfig \ 
    910         pc-bugreport \ 
    1011         pc-controlpanel \ 
Note: See TracChangeset for help on using the changeset viewer.