Comment 11 for bug 1571241

Revision history for this message
Richard Laager (rlaager) wrote :

Attached is a backport of the fix from upstream. If I have a pool which was last imported using /dev/disk/by-id names, the patch causes zpool import to import it using /dev/disk/by-id names.

Note that this fix has not yet been merged upstream.

Also, note that the patch did not apply *perfectly* cleanly. In the original patch, #define DEV_BYID_PATH was moved. In my backport, it is simply added, because it did not exist. That is, the removal hunk did not apply cleanly. Likewise, a hunk which was the removal of a blank line did not apply cleanly.

The safest course of action here is to wait until it is accepted upstream and merged into the release branch (addressing the two hunks described above). Then it can be cleanly backported and SRUed.