Changeset 374a723


Ignore:
Timestamp:
08/15/13 15:06:48 (16 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
256b8024
Parents:
4f0d211 (diff), 2e91463 (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

Location:
src-sh
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-su/pc-su

    rb99c25f r2e91463  
    1010        if [ $? -eq 0 ] ; then 
    1111           qsudo $VARS 
    12            exit $?  
     12           exit $? 
    1313        fi 
    1414 
     
    1717        if [ $? -eq 0 ] ; then 
    1818           gksu -a "$VARS" 
    19            exit $?  
     19           exit $? 
    2020        fi 
    2121 
     
    2424        if [ $? -eq 0 ] ; then 
    2525           kdesu -t -c "$VARS" 
    26            exit $?  
     26           exit $? 
    2727        fi 
    2828         
  • src-sh/lpreserver/backend/zfslistcron.sh

    rf615958 r1e93fd8  
    1818   min=`grep "${PROGDIR}/backend/runsnap.sh" /etc/crontab | awk '{print $1}'` 
    1919   hour=`grep "${PROGDIR}/backend/runsnap.sh" /etc/crontab | awk '{print $2}'` 
     20   count=`grep "${PROGDIR}/backend/runsnap.sh" /etc/crontab | awk '{print $9}'` 
    2021   time="Min: $min Hour: $hour"; 
    2122   if [ "$min" = "0" -a "$hour" != '*' ] ; then time="daily@$hour" ; fi 
     
    2425   if [ "$min" = '*/10' ] ; then time="10min" ; fi 
    2526   if [ "$min" = '*/5' ] ; then time="5min" ; fi 
    26    echo "$i - $time" 
     27   echo "$i - $time - total: $count" 
    2728done 
  • src-sh/lpreserver/lpreserver

    rfa6febe r4f0d211  
    206206  For a listing of all scheduled snapshots 
    207207 
    208   # lpreserver cronsnap  
     208  # lpreserver listcron 
    209209 
    210210  or 
Note: See TracChangeset for help on using the changeset viewer.