Merge pull request #133 from jp39/run-on-zfs-host

Add ability to run the provisioner directly on the ZFS host.

Author: ccremer

docker/update-permissions.sh

@@ -5,7 +5,9 @@ set -eo pipefail
 zfs_mod="${ZFS_MOD:-g+w}"
 chmod_bin=${ZFS_CHOWN_BIN:-sudo -H chmod}
 
-zfs_host="${1}"
-zfs_mountpoint="${2}"
+zfs_mountpoint="${1}"
+
+# Do not try to manually modify these Env vars, they will be updated by the provisioner just before invoking the script.
+zfs_host="${ZFS_HOST}"
 
 ssh "${zfs_host}" "${chmod_bin} ${zfs_mod} ${zfs_mountpoint}"

pkg/zfs/zfs.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"sync"
 
 	gozfs "github.com/mistifyio/go-zfs/v3"
@@ -114,11 +115,32 @@ func (z *zfsImpl) SetPermissions(dataset *Dataset) error {
 	if dataset.Mountpoint == "" {
 		return fmt.Errorf("undefined mountpoint for dataset: %s", dataset.Name)
 	}
-	cmd := exec.Command("update-permissions", dataset.Hostname, dataset.Mountpoint)
-	out, err := cmd.CombinedOutput()
+
+	globalLock.Lock()
+	defer globalLock.Unlock()
+	if err := setEnvironmentVars(dataset.Hostname); err != nil {
+		return err
+	}
+	cmd := exec.Command("update-permissions", dataset.Mountpoint)
+	if filepath.IsAbs(cmd.Path) {
+		out, err := cmd.CombinedOutput()
+		if err != nil {
+			return fmt.Errorf("could not update permissions on '%s': %w: %s", dataset.Hostname, err, out)
+		}
+		return nil
+	}
+
+	// update-permissions executable not found in PATH
+	st, err := os.Lstat(dataset.Mountpoint)
 	if err != nil {
-		return fmt.Errorf("could not update permissions on '%s': %w: %s", dataset.Hostname, err, out)
+		return err
 	}
+
+	// Add group write bit
+	if err := os.Chmod(dataset.Mountpoint, st.Mode()|0o020); err != nil {
+		return err
+	}
+
 	return nil
 }
 

test/update-permissions

@@ -5,6 +5,6 @@ set -eo pipefail
 zfs_mod="${ZFS_MOD:-g+w}"
 chmod_bin=${ZFS_CHOWN_BIN:-chmod}
 
-zfs_mountpoint="${2}"
+zfs_mountpoint="${1}"
 
 ${chmod_bin} ${zfs_mod} ${zfs_mountpoint}