Upstream: import -d does not go through os/macos/ sources

On macOS we need to prioritise /dev/disk over /dev/rdisk, but the common code makes no adjustment based on os preferred names. Potentially we should possibly call an os/ function to set the priority. Signed-off-by: Jorgen Lundman <[email protected]>
openzfsonosx · Jun 22, 2021 · 7d0b6a5 · 7d0b6a5
1 parent 490ff77
commit 7d0b6a5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c
@@ -1217,6 +1217,12 @@ zpool_find_import_scan_add_slice(libpc_handle_t *hdl, pthread_mutex_t *lock,
 	slice->rn_lock = lock;
 	slice->rn_avl = cache;
 	slice->rn_hdl = hdl;
+#ifdef __APPLE__
+	/* Prefer diskX over rdiskX: involve os/ somehow? */
+	if (name[0] == 'r')
+		slice->rn_order = order + IMPORT_ORDER_DEFAULT;
+	else
+#endif
 	slice->rn_order = order + IMPORT_ORDER_SCAN_OFFSET;
 	slice->rn_labelpaths = B_FALSE;