From 4804b739e1e851f21f8e98c99275af2570c44a15 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 20 May 2011 10:25:41 -0700 Subject: [PATCH] Default to internal 'zfs userspace' implementation We will never bring over the pyzfs.py helper script from Solaris to Linux. Instead the missing functionality will be directly integrated in to the zfs commands and libraries. To avoid confusion remove the warning about the missing pyzfs.py utility and simply use the default internal support. The Illumous developers are of the same mind and have proposed an initial patch to do this which has been integrated in to the 'allow' development branch. After some additional testing this code can be merged in to master as the right long term solution. --- cmd/zfs/zfs_main.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 32f85b1e01..0953336abe 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -1879,16 +1879,6 @@ zfs_do_userspace(int argc, char **argv) zfs_userquota_prop_t p; int error; - /* - * Try the python version. If the execv fails, we'll continue - * and do a simplistic implementation. - */ - (void) execv(pypath, argv-1); - - (void) printf("internal error: %s not found\n" - "falling back on built-in implementation, " - "some features will not work\n", pypath); - if ((zhp = zfs_open(g_zfs, argv[argc-1], ZFS_TYPE_DATASET)) == NULL) return (1);