Changeset aaa71d1


Ignore:
Timestamp:
05/13/14 09:41:09 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
b3da723
Parents:
de73897 (diff), 30cf8dd (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 added
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/warden/scripts/backend/functions.sh

    rcca8f57 rde73897  
    368368  echo "Snapshot                                Comment" 
    369369  echo "-----------------------------------------------" 
    370   for i in `zfs list -t snapshot | grep -w "^${tank}${rp}" | cut -d '@' -f 2 | awk '{print $1}'` 
     370  for i in `zfs list -r -t snapshot ${tank}${rp} 2>/dev/null | cut -d '@' -f 2 | awk '{print $1}'` 
    371371  do 
    372      comment=`zfs get -o value warden:comment $i | grep -v "VALUE"` 
    373      echo "$i           $comment" 
     372     comment=`zfs get -o value warden:comment ${tank}${rp}@$i 2>/dev/null| grep -v "VALUE"` 
     373     lcomment=`zfs get -o value lpreserver:comment ${tank}${rp}@$i 2>/dev/null| grep -v "VALUE"` 
     374     if [ -z "$comment" -a -n "$lcomment" ] ; then 
     375       echo "$i         $lcomment" 
     376     else 
     377       echo "$i         $comment" 
     378     fi 
    374379  done 
    375380} 
Note: See TracChangeset for help on using the changeset viewer.