From d264a033cd4e5bad83aee212b543a1a83efd4795 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Fri, 23 Aug 2013 23:47:59 +0000 Subject: [PATCH] Update vendor/illumos/dist to 14160:734110b9882f: Illumos ZFS issues: 1765 assert triggered in libzfs_import.c trying to import pool name beginning with a number --- cmd/zpool/zpool_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index 833aabcde7f..87e8ad30f5e 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -24,6 +24,7 @@ * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright (c) 2012 by Frederik Wessels. All rights reserved. + * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved. */ #include @@ -1988,8 +1989,10 @@ zpool_do_import(int argc, char **argv) errno = 0; searchguid = strtoull(argv[0], &endptr, 10); - if (errno != 0 || *endptr != '\0') + if (errno != 0 || *endptr != '\0') { searchname = argv[0]; + searchguid = 0; + } found_config = NULL; /*