Changeset 44ec5ba


Ignore:
Timestamp:
07/31/13 14:04:42 (13 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
Children:
4f9718b
Parents:
1fd551d (diff), 59d0cef (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:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • 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   } 
  • src-sh/lpreserver/backend/zfscronsnap.sh

    rc684936 r1fd551d  
    3333  enable_cron "$DATASET" "$TIME" "$COUNT" 
    3434  echo "Snapshot frequency set: $TIME" 
    35   echo "Snapshot days to keep set: $COUNT" 
     35  echo "Snapshot # to keep set: $COUNT" 
    3636  exit 0 
    3737fi 
  • src-sh/lpreserver/lpreserver

    r8c2bd1a r1fd551d  
    4747     mksnap - Create a ZFS snapshot of a zpool/dataset 
    4848   listsnap - List snapshots of a zpool/dataset 
     49   listcron - Listing of scheduled snapshots 
    4950   cronsnap - Schedule snapshot creation via cron 
    5051 revertsnap - Revert zpool/dataset to a snapshot 
     52  replicate - Enable / Disable ZFS replication to a remote system 
    5153     rmsnap - Remove a snapshot 
    5254__EOF__ 
    5355}; 
     56 
     57help_replicate() 
     58{ 
     59 title 
     60 echo "Help replicate 
     61 
     62Life-Preserver replication sub-system 
     63 
     64Replication uses ZFS to send your snapshots to a remote system which also has 
     65a ZFS pool, such as FreeNAS or another PC-BSD system. The <hostdataset> must 
     66also be scheduled for snapshots for replication to occur.  
     67 
     68Available Flags: 
     69        list - List replication targets 
     70         add - Add a new replication target 
     71      remove - Remove a replication target 
     72 
     73Add Options: 
     74 
     75        add <remotehost> <user> <port> <hostdataset> <remotedataset> <time> 
     76 
     77        Example 1:  
     78 
     79        add freenas.8343 backupuser 22 tank1/usr/home/kris tankbackup/backups sync 
     80 
     81        Will schedule replication of tank1/usr/home/kris to tankbackup/backups with each snapshot 
     82 
     83        Example 2:  
     84 
     85        add freenas.8343 backupuser 22 tank1 tankbackup/backups 22 
     86 
     87        Will schedule replication of tank1 to tankbackup/backups at 10PM, notated in 24hour time 
     88 
     89Remove Options: 
     90 
     91        remove <id> 
     92         
     93        Remove a replication task indicated by <id> 
     94        Use 'replicate list' for a list of IDs.  
     95 
     96Usage: 
     97 
     98  lpreserver replicate <subcmd> <flags> 
     99 
     100Example: 
     101 
     102  lpreserver replicate 
     103" 
     104}; 
     105 
    54106 
    55107help_set() 
     
    106158}; 
    107159 
     160help_listcron() 
     161{ 
     162 title 
     163 echo "Help listcron 
     164 
     165List scheduled cron snapshots 
     166 
     167Usage: 
     168 
     169  lpreserver listcron 
     170" 
     171}; 
    108172 
    109173help_listsnap() 
     
    231295           set) help_set ;; 
    232296           mksnap) help_mksnap ;; 
     297           listcron) help_listcron ;; 
    233298           listsnap) help_listsnap ;; 
    234299           revertsnap) help_revertsnap ;; 
     300           replicate) help_replicate ;; 
    235301           cronsnap) help_cronsnap ;; 
    236302           rmsnap) help_rmsnap ;; 
     
    280346         ;; 
    281347 
     348 listcron) require_root 
     349         ${PROGDIR}/backend/zfslistcron.sh  
     350         ;; 
     351 
    282352 listsnap) require_root 
    283353         DATASET="$2" 
Note: See TracChangeset for help on using the changeset viewer.