Changeset 7cea9ab1a636f9c76cf5f6af6502e308b246c646

Show
Ignore:
Timestamp:
11/19/07 14:02:19 (6 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1195480939 +0000
git-parent:

[263a26146a75d7114c8ab41d9077bf4b952666b3]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1195480939 +0000
Message:

fixes #21

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Makefile.in

    r2bc5626 r7cea9ab  
    1616install=./install-sh -c 
    1717 
     18zfs=@ZFS@ 
    1819perl=@PERL@ 
    1920pod2man=@POD2MAN@ 
     
    2122all: 
    2223        sed -e "s#/usr/bin/perl#$(perl)#;" -e "s#__PREFIX__#$(prefix)#;" \ 
     24                -e "s#__ZFS__#$(zfs)#;" \ 
    2325        < zetaback.in > zetaback 
    2426        sed -e "s#/usr/bin/perl#$(perl)#;" -e "s#__PREFIX__#$(prefix)#;" \ 
     27                -e "s#__ZFS__#$(zfs)#;" \ 
    2528        < zetaback_agent.in > zetaback_agent 
    2629 
  • configure.in

    r104cbd0 r7cea9ab  
    11AC_INIT(zetaback.in) 
     2AC_PATH_PROG(ZFS,zfs, ,/usr/sbin /sbin) 
    23AC_PATH_PROG(PERL,perl, ,/usr/bin /usr/perl5/bin) 
    34AC_PATH_PROG(POD2MAN,pod2man, ,/usr/bin /usr/perl5/bin) 
  • zetaback.in

    r263a261 r7cea9ab  
    752752  } 
    753753  else { 
    754     $command = "/usr/sbin/zfs recv $fs"; 
     754    $command = "__ZFS__ recv $fs"; 
    755755  } 
    756756  print " => piping $file to $command\n" if($DEBUG); 
  • zetaback_agent.in

    r104cbd0 r7cea9ab  
    171171    die "zfs_agent_remove_snap: illegal snap: $SNAP\n"; 
    172172  } 
    173   `/usr/sbin/zfs destroy $target`; 
     173  `__ZFS__ destroy $target`; 
    174174} 
    175175 
     
    179179    die "zfs_agent_perform_full: bad fs or snap name\n" 
    180180  } 
    181   `/usr/sbin/zfs snapshot $target`; 
    182   my @cmd = ("/usr/sbin/zfs", "send", $target); 
     181  `__ZFS__ snapshot $target`; 
     182  my @cmd = ("__ZFS__", "send", $target); 
    183183  if($NEEDSFD) { 
    184184    fifo_exec(@cmd); 
     
    195195    die "zfs_agent_perform_incremental: bad args\n" 
    196196  } 
    197   `/usr/sbin/zfs snapshot $target`; 
    198   my @cmd = ("/usr/sbin/zfs", "send", "-i", $base, $target); 
     197  `__ZFS__ snapshot $target`; 
     198  my @cmd = ("__ZFS__", "send", "-i", $base, $target); 
    199199  if($NEEDSFD) { 
    200200    fifo_exec(@cmd); 
     
    207207sub zfs_agent_list { 
    208208  my %zfs; 
    209   open(ZFSLIST, "/usr/sbin/zfs list -H |"); 
     209  open(ZFSLIST, "__ZFS__ list -H |"); 
    210210  while(<ZFSLIST>) { 
    211211    chomp; 
     
    236236    # Optionally work around Solaris bug: 6343779 
    237237    my $base = $ZFS . '@__zb_full_' . $BUG_6343779; 
    238     `/usr/sbin/zfs unmount $ZFS`; 
    239     `/usr/sbin/zfs rollback $base`; 
    240   } 
    241   my @cmd = ("/usr/sbin/zfs", "recv", $ZFS); 
     238    `__ZFS__ unmount $ZFS`; 
     239    `__ZFS__ rollback $base`; 
     240  } 
     241  my @cmd = ("__ZFS__", "recv", $ZFS); 
    242242  exec { $cmd[0] } @cmd; 
    243243  exit;