Changeset ccffc93


Ignore:
Timestamp:
07/31/13 09:53:45 (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
79c63c9
Parents:
4c15f05 (diff), 30a0688 (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-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 \ 
  • src-sh/lpreserver/backend/functions.sh

    r0fe982e r8c2bd1a  
    3030  if [ -e "${DBDIR}/emaillevel" ] ; then 
    3131    export EMAILMODE="`cat ${DBDIR}/emaillevel`" 
     32  fi 
     33 
     34  if [ -e "${DBDIR}/duwarn" ] ; then 
     35    export DUWARN="`cat ${DBDIR}/duwarn`" 
     36  else 
     37    export DUWARN=85 
    3238  fi 
    3339 
  • src-sh/lpreserver/backend/zfsmon.sh

    rca25b67 r4c15f05  
    1010. ${PROGDIR}/backend/functions.sh 
    1111 
    12 # Placeholder for now, will be our ZFS monitoring stuff here 
     12# Lets do a health-check on the zpool 
     13ZSTATUS="`zpool status -x`" 
     14if [ "$ZSTATUS" != "all pools are healthy" ] ; then 
     15  email_msg "zpool issue" "The zpool command reports an issue on the system:\n\r $ZSTATUS" 
     16  echo "$ZSTATUS" > $DBDIR/zpool-alert 
     17else 
     18  # Cleanup any old alert files 
     19  if [ -d "${DBDIR}/zpool-alert" ] ; then rm ${DBDIR}/zpool-alert; fi 
     20fi 
     21 
     22if [ "$EMAILMODE" = "ERROR" ] ; then exit 0 ; fi 
     23 
     24haveMsg=0 
     25 
     26# Remove the old du alert flag 
     27if [ -e "${DBDIR}/zpool-alert-du" ] ; then rm ${DBDIR}/zpool-alert-du ; fi 
     28 
     29zpool list  | grep -v "^NAME" > /tmp/.lPreserver-df.$$ 
     30while read line 
     31do 
     32   cap=`echo $line | awk '{print $5}' | cut -d '%' -f 1` 
     33   zpool=`echo $line | awk '{print $1}'` 
     34   if [ $(is_num "$cap") ] ; then 
     35      if [ $cap -gt $DUWARN ] ; then 
     36         queue_msg "Warning! ${zpool} is currently at ${cap}% capacity!"         
     37         echo "$cap" > $DBDIR/zpool-alert-du 
     38         haveMsg=1 
     39      fi 
     40   fi 
     41done< /tmp/.lPreserver-df.$$ 
     42rm /tmp/.lPreserver-df.$$ 
     43 
     44# Lets check free disk space on the pools 
     45if [ $haveMsg -eq 1 ] ; then 
     46   email_msg "zpool warning" "`echo_queue_msg`" 
     47fi 
     48 
  • src-sh/lpreserver/lpreserver

    r7814c14 r8c2bd1a  
    6565 
    6666Config options 
     67 
     68     duwarn - Set to a disk percentage [0-99] at which to warn of low disk space 
    6769 
    6870      email - Set the e-mail address to receive notifications 
     
    240242         title 
    241243         echo "      Recursive mode: $RECURMODE" 
    242          echo "E-Mail Notifications: $EMAILMODE" 
    243          echo "    E-Mail Addresses: $EMAILADDY" 
     244         echo "E-mail notifications: $EMAILMODE" 
     245         echo "    E-mail addresses: $EMAILADDY" 
     246         echo "  Disk space warn at: ${DUWARN}%" 
    244247         exit 0 
    245248         ;; 
     
    257260            email) echo "Setting email notification to: $3"  
    258261                   echo "$3" > ${DBDIR}/emails ;; 
     262           duwarn) if [ ! $(is_num "$3") ] ; then exit_err "Invalid number, must be 0-99"; fi 
     263                   echo "Setting disk warning capacity to: ${3}%"  
     264                   echo "$3" > ${DBDIR}/duwarn ;; 
    259265        recursive) case $3 in 
    260266                  OFF|Off|off)  echo "Recursive mode disabled"  
Note: See TracChangeset for help on using the changeset viewer.