From 127dee7b60cfa71fd4a0cfb783c4693fcfbfd3d7 Mon Sep 17 00:00:00 2001
From: Jesus Alvarez <jeezusjr@gmail.com>
Date: Sun, 20 Oct 2013 21:24:03 -0700
Subject: [PATCH] Change /usr/sbin to /usr/bin

---
 zfs-utils/zfs-utils.initcpio.hook | 10 +++++-----
 zfs-utils/zfs-utils.service       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zfs-utils/zfs-utils.initcpio.hook b/zfs-utils/zfs-utils.initcpio.hook
index 9419f8b..627038e 100644
--- a/zfs-utils/zfs-utils.initcpio.hook
+++ b/zfs-utils/zfs-utils.initcpio.hook
@@ -1,7 +1,7 @@
 ZPOOL_FORCE=""
 
 zfs_get_bootfs () {
-    for zfs_dataset in $(/usr/sbin/zpool list -H -o bootfs); do
+    for zfs_dataset in $(/usr/bin/zpool list -H -o bootfs); do
         case ${zfs_dataset} in
             "" | "-")
                 # skip this line/dataset
@@ -23,7 +23,7 @@ zfs_mount_handler () {
     if [ "$ZFS_DATASET" = "bootfs" ] ; then
         if ! zfs_get_bootfs ; then
             # Lets import everything and try again
-            /usr/sbin/zpool import -N -a $ZPOOL_FORCE
+            /usr/bin/zpool import -N -a $ZPOOL_FORCE
             if ! zfs_get_bootfs ; then
                 echo "ZFS: Cannot find bootfs."
                 return 1
@@ -32,16 +32,16 @@ zfs_mount_handler () {
     fi
 
     local pool="${ZFS_DATASET%%/*}"
-    if ! "/usr/sbin/zpool" list -H $pool > /dev/null ; then
+    if ! "/usr/bin/zpool" list -H $pool > /dev/null ; then
         echo "ZFS: Importing pool $pool."
 
-        if ! "/usr/sbin/zpool" import -N $pool $ZPOOL_FORCE ; then
+        if ! "/usr/bin/zpool" import -N $pool $ZPOOL_FORCE ; then
             echo "ZFS: Unable to import pool $pool."
             return 1
         fi
     fi
 
-    local mountpoint=$("/usr/sbin/zfs" get -H -o value mountpoint $ZFS_DATASET)
+    local mountpoint=$("/usr/bin/zfs" get -H -o value mountpoint $ZFS_DATASET)
     if [ "$mountpoint" = "legacy" ] ; then
         mount -t zfs "$ZFS_DATASET" "$node"
     else
diff --git a/zfs-utils/zfs-utils.service b/zfs-utils/zfs-utils.service
index c2beeba..d7a4a50 100644
--- a/zfs-utils/zfs-utils.service
+++ b/zfs-utils/zfs-utils.service
@@ -9,7 +9,7 @@ Conflicts=shutdown.target umount.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/sbin/modprobe zfs
+ExecStart=/usr/bin/modprobe zfs
 ExecStart=/usr/bin/zpool import -c /etc/zfs/zpool.cache -aN
 ExecStart=/usr/bin/zfs mount -a
 ExecStart=/usr/bin/zfs share -a