Merge branch 'pvalkone-freebsd-portability-fixes'

Closes adaugherity#4.
Resolved Conflicts:
	zfs-backup.sh

Author: adaugherity

zfs-backup.sh

@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
 # /usr/xpg4/bin/sh and /bin/bash also work; /bin/sh does not
 
 # backup script to replicate a ZFS filesystem and its children to another
@@ -64,6 +64,8 @@ LOCK="/var/tmp/zfsbackup.lock"
 PID="/var/tmp/zfsbackup.pid"
 CFG="/var/lib/zfssnap/zfs-backup.cfg"
 ZFS="/usr/sbin/zfs"
+# Replace with sudo(8) if pfexec(1) is not available on your OS
+PFEXEC=`which pfexec`
 
 # local settings -- datasets to back up are now found by property
 TAG="zfs-auto-snap_daily"
@@ -231,10 +233,10 @@ do_backup() {
     fi
 
     if [ $DEBUG ]; then
-	echo "would run: $ZFS send -R -I $snap1 $DATASET@$snap2 |"
-	echo "  $REMZFS_CMD recv $RECV_OPT -vF $REMPOOL"
+	echo "would run: $PFEXEC $ZFS send -R -I $snap1 $DATASET@$snap2 |"
+	echo "  $REMZFS_CMD recv $VERBOSE $RECV_OPT -F $REMPOOL"
     else
-	if ! pfexec $ZFS send -R -I $snap1 $DATASET@$snap2 | \
+	if ! $PFEXEC $ZFS send -R -I $snap1 $DATASET@$snap2 | \
 	  $REMZFS_CMD recv $VERBOSE $RECV_OPT -F $REMPOOL; then
 	    echo 1>&2 "Error sending snapshot."
 	    touch $LOCK