Print this page
1765 assert importing pool with number at start

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/zpool/zpool_main.c
          +++ new/usr/src/cmd/zpool/zpool_main.c
↓ open down ↓ 1980 lines elided ↑ open up ↑
1981 1981           *      <id>    Find the pool that corresponds to the given GUID/pool
1982 1982           *              name and import that one.
1983 1983           *
1984 1984           *      -D      Above options applies only to destroyed pools.
1985 1985           */
1986 1986          if (argc != 0) {
1987 1987                  char *endptr;
1988 1988  
1989 1989                  errno = 0;
1990 1990                  searchguid = strtoull(argv[0], &endptr, 10);
1991      -                if (errno != 0 || *endptr != '\0')
     1991 +                if (errno != 0 || *endptr != '\0') {
1992 1992                          searchname = argv[0];
     1993 +                        searchguid = 0;
     1994 +                }
1993 1995                  found_config = NULL;
1994 1996  
1995 1997                  /*
1996 1998                   * User specified a name or guid.  Ensure it's unique.
1997 1999                   */
1998 2000                  idata.unique = B_TRUE;
1999 2001          }
2000 2002  
2001 2003  
2002 2004          idata.path = searchdirs;
↓ open down ↓ 3189 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX