From 5bf49743a6e0f1c79606da6af3ed00bc7629b8f3 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 16 Jan 2009 14:51:52 -0800
Subject: [PATCH 1/2] Add minor root check for convenience

---
 scripts/zpool-create.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/zpool-create.sh b/scripts/zpool-create.sh
index e46b02cdda..4b8e3a8bf2 100755
--- a/scripts/zpool-create.sh
+++ b/scripts/zpool-create.sh
@@ -62,6 +62,10 @@ while getopts 'hvc:p:' OPTION; do
 	esac
 done
 
+if [ $(id -u) != 0 ]; then
+        die "Must run as root"
+fi
+
 check_config || die "${ERROR}"
 . ${ZPOOL_CONFIG}
 

From 7c5b7d2a940f07d0a6e4a018962cc934451366e0 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 16 Jan 2009 14:52:35 -0800
Subject: [PATCH 2/2] This should always be success when zvol support is
 disabled

---
 lib/libzfs/libzfs_pool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
index 05659552b2..ee352a4290 100644
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@ -2195,7 +2195,7 @@ err:
 	free(paths);
 	(void) close(base);
 #endif
-	return (-1);
+	return (0);
 }
 
 typedef struct zvol_cb {