Changeset 59d0cef


Ignore:
Timestamp:
07/31/13 13:22:20 (13 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
4f9718b, 6e77702
Parents:
242767e (diff), 79c63c9 (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

    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"  
  • src-sh/port-files/pkg-plist

    r4c50941 r79c63c9  
    261261share/pcbsd/metaset/pcbsd/KDE-Calligra/pkg-desc 
    262262share/pcbsd/metaset/pcbsd/KDE-Calligra/pkg-icon.png 
     263share/pcbsd/metaset/pcbsd/KDE-Calligra/dl-only 
    263264share/pcbsd/metaset/pcbsd/XFCE/desktop 
    264265share/pcbsd/metaset/pcbsd/XFCE/pkg-desc 
     
    273274share/pcbsd/metaset/pcbsd/XBMC/ports-list 
    274275share/pcbsd/metaset/pcbsd/XBMC/pkg-desc 
     276share/pcbsd/metaset/pcbsd/XBMC/dl-only 
    275277share/pcbsd/metaset/pcbsd/Awesome/pkg-parent 
    276278share/pcbsd/metaset/pcbsd/Awesome/ports-list 
     
    288290share/pcbsd/metaset/pcbsd/KDE-Education/pkg-desc 
    289291share/pcbsd/metaset/pcbsd/KDE-Education/pkg-icon.png 
     292share/pcbsd/metaset/pcbsd/KDE-Education/dl-only 
    290293share/pcbsd/metaset/pcbsd/Openbox/pkg-icon.png 
    291294share/pcbsd/metaset/pcbsd/Openbox/desktop 
     
    316319share/pcbsd/metaset/pcbsd/GNOME-Games/pkg-parent 
    317320share/pcbsd/metaset/pcbsd/GNOME-Games/pkg-desc 
     321share/pcbsd/metaset/pcbsd/GNOME-Games/dl-only 
    318322share/pcbsd/metaset/pcbsd/Compiz/pkg-icon.png 
    319323share/pcbsd/metaset/pcbsd/Compiz/ports-list 
     
    371375share/pcbsd/metaset/pcbsd/KDE-Games/ports-list 
    372376share/pcbsd/metaset/pcbsd/KDE-Games/pkg-parent 
     377share/pcbsd/metaset/pcbsd/KDE-Games/dl-only 
    373378share/pcbsd/metaset/pcbsd/NVIDIA-Legacy-71/post-remove.sh 
    374379share/pcbsd/metaset/pcbsd/NVIDIA-Legacy-71/pkg-icon.png 
     
    382387share/pcbsd/metaset/pcbsd/KDE-WebDevKit/pkg-parent 
    383388share/pcbsd/metaset/pcbsd/KDE-WebDevKit/pkg-desc 
     389share/pcbsd/metaset/pcbsd/KDE-WebDevKit/dl-only 
    384390share/pcbsd/metaset/pcbsd/Enlightenment-Modules/pkg-parent 
    385391share/pcbsd/metaset/pcbsd/Enlightenment-Modules/ports-list 
     
    419425share/pcbsd/metaset/pcbsd/KDE-SDK/pkg-desc 
    420426share/pcbsd/metaset/pcbsd/KDE-SDK/pkg-icon.png 
     427share/pcbsd/metaset/pcbsd/KDE-SDK/dl-only 
    421428share/pcbsd/metaset/pcbsd/KDE-Graphics/pkg-icon.png 
    422429share/pcbsd/metaset/pcbsd/KDE-Graphics/pkg-parent 
     
    434441share/pcbsd/metaset/pcbsd/KDE-Toys/pkg-desc 
    435442share/pcbsd/metaset/pcbsd/KDE-Toys/pkg-icon.png 
     443share/pcbsd/metaset/pcbsd/KDE-Toys/dl-only 
    436444share/pcbsd/metaset/pcbsd/Ratpoison/desktop 
    437445share/pcbsd/metaset/pcbsd/Ratpoison/pkg-parent 
     
    455463share/pcbsd/metaset/pcbsd/MythTV/post-remove.sh 
    456464share/pcbsd/metaset/pcbsd/MythTV/post-install.sh 
     465share/pcbsd/metaset/pcbsd/MythTV/dl-only 
    457466share/pcbsd/metaset/pcbsd/Misc/pkg-desc 
    458467share/pcbsd/metaset/pcbsd/Misc/pkg-icon.png 
  • src-qt4/pc-mounttray/mountTray.cpp

    r9d167cc7 r242767e  
    160160void MountTray::slotTrayActivated(QSystemTrayIcon::ActivationReason reason) { 
    161161   if(reason == QSystemTrayIcon::Trigger) { 
     162     //Make sure all the items are updated 
     163     for(int i=0; i<deviceList.length(); i++){ 
     164        deviceList[i]->updateItem(); 
     165     } 
    162166     trayIcon->contextMenu()->popup(QCursor::pos()); 
    163167   } 
Note: See TracChangeset for help on using the changeset viewer.