Merge branch 'dev-zfs-0.6.5.x' into dev-zfs-0.7.x
This commit is contained in:
		
						commit
						159184017a
					
				
							
								
								
									
										3
									
								
								zpool.go
								
								
								
								
							
							
						
						
									
										3
									
								
								zpool.go
								
								
								
								
							| 
						 | 
				
			
			@ -377,6 +377,9 @@ func poolSearchImport(q string, searchpaths []string, guid bool) (name string,
 | 
			
		|||
			err = errPoolList
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		if PoolState(C.get_zpool_state(tconfig)) == PoolStateDestroyed {
 | 
			
		||||
			continue // skip destroyed pools
 | 
			
		||||
		}
 | 
			
		||||
		if guid {
 | 
			
		||||
			sguid := fmt.Sprint(C.get_zpool_guid(tconfig))
 | 
			
		||||
			if q == sguid {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue