From 14017dc18a9af43c3926f53872bb711b96eeed0c Mon Sep 17 00:00:00 2001 From: mav Date: Mon, 16 Jul 2018 02:48:59 +0000 Subject: [PATCH] MFC r335874: Cut currdev dev and path fields for ZFS on the last colon. Previously the code cut those fields on second colon, that prevented boot from boot environments with colon in their names. This change moves the limitation from dev field to path, which is empty by default. --- stand/zfs/zfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/zfs/zfs.c b/stand/zfs/zfs.c index a8183400edf..818d559c2f2 100644 --- a/stand/zfs/zfs.c +++ b/stand/zfs/zfs.c @@ -660,7 +660,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const char *devspec, const char **path) if (*np != ':') return (EINVAL); np++; - end = strchr(np, ':'); + end = strrchr(np, ':'); if (end == NULL) return (EINVAL); sep = strchr(np, '/'); -- 2.45.0