svn commit: r336327 - stable/11/stand/zfs

[Alexander Motin]

Author: mav
Date: Mon Jul 16 02:48:59 2018
New Revision: 336327
URL: https://svnweb.freebsd.org/changeset/base/336327

Log:
  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.

Modified:
  stable/11/stand/zfs/zfs.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/zfs/zfs.c
==============================================================================
--- stable/11/stand/zfs/zfs.c	Mon Jul 16 01:34:45 2018	(r336326)
+++ stable/11/stand/zfs/zfs.c	Mon Jul 16 02:48:59 2018	(r336327)
@@ -660,7 +660,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const char *devs
 	if (*np != ':')
 		return (EINVAL);
 	np++;
-	end = strchr(np, ':');
+	end = strrchr(np, ':');
 	if (end == NULL)
 		return (EINVAL);
 	sep = strchr(np, '/');